From 0fca85a6b44023c40e76e2f3c2c070a97a5d26b1 Mon Sep 17 00:00:00 2001
From: Aveline <352441+ym@users.noreply.github.com>
Date: Thu, 22 May 2025 10:29:16 +0200
Subject: [PATCH] refactor: remove init functions (#489)

---
 .golangci.yml | 4 ++++
 display.go    | 4 +---
 jiggler.go    | 4 +---
 main.go       | 6 +++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index ccd3c1af..23e27629 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,6 +4,7 @@ linters:
     - forbidigo
     - misspell
     - whitespace
+    - gochecknoinits
   settings:
     forbidigo:
       forbid:
@@ -22,6 +23,9 @@ linters:
       - linters:
           - errcheck
         path: _test.go
+      - linters:
+          - gochecknoinits
+        path: internal/logging/sse.go
     paths:
       - third_party$
       - builtin$
diff --git a/display.go b/display.go
index f4d2a945..2a223512 100644
--- a/display.go
+++ b/display.go
@@ -370,9 +370,7 @@ func startBacklightTickers() {
 	}
 }
 
-func init() {
-	ensureConfigLoaded()
-
+func initDisplay() {
 	go func() {
 		waitCtrlClientConnected()
 		displayLogger.Info().Msg("setting initial display contents")
diff --git a/jiggler.go b/jiggler.go
index 94f7d15d..0a33fd61 100644
--- a/jiggler.go
+++ b/jiggler.go
@@ -15,9 +15,7 @@ func rpcGetJigglerState() bool {
 	return jigglerEnabled
 }
 
-func init() {
-	ensureConfigLoaded()
-
+func initJiggler() {
 	go runJiggler()
 }
 
diff --git a/main.go b/main.go
index aa743d92..c25d8b8f 100644
--- a/main.go
+++ b/main.go
@@ -75,8 +75,8 @@ func Main() {
 		}
 	}()
 
+	// initialize usb gadget
 	initUsbGadget()
-
 	if err := setInitialVirtualMediaState(); err != nil {
 		logger.Warn().Err(err).Msg("failed to set initial virtual media state")
 	}
@@ -84,6 +84,10 @@ func Main() {
 	if err := initImagesFolder(); err != nil {
 		logger.Warn().Err(err).Msg("failed to init images folder")
 	}
+	initJiggler()
+
+	// initialize display
+	initDisplay()
 
 	go func() {
 		time.Sleep(15 * time.Minute)