remove global systray

Author: dido18

hub.go

@@ -223,9 +223,10 @@ func checkCmd(m []byte) {
 		go logAction(sl)
 	} else if strings.HasPrefix(sl, "restart") {
 		log.Println("Received restart from the daemon. Why? Boh")
-		Systray.Restart()
+		// TODO enable them
+		// Systray.Restart()
 	} else if strings.HasPrefix(sl, "exit") {
-		Systray.Quit()
+		// Systray.Quit()
 	} else if strings.HasPrefix(sl, "memstats") {
 		memoryStats()
 	} else if strings.HasPrefix(sl, "gc") {

info.go

@@ -19,6 +19,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/arduino/arduino-create-agent/systray"
 	"github.com/gin-gonic/gin"
 	"go.bug.st/serial"
 )
@@ -40,14 +41,16 @@ func infoHandler(c *gin.Context) {
 	})
 }
 
-func pauseHandler(c *gin.Context) {
-	go func() {
-		ports, _ := serial.GetPortsList()
-		for _, element := range ports {
-			spClose(element)
-		}
-		*hibernate = true
-		Systray.Pause()
-	}()
-	c.JSON(200, nil)
+func PauseHandler(s *systray.Systray) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		go func() {
+			ports, _ := serial.GetPortsList()
+			for _, element := range ports {
+				spClose(element)
+			}
+			*hibernate = true
+			s.Pause()
+		}()
+		c.JSON(200, nil)
+	}
 }

main.go

@@ -103,9 +103,8 @@ var homeTemplateHTML string
 
 // global clients
 var (
-	Tools   *tools.Tools
-	Systray systray.Systray
-	Index   *index.Resource
+	Tools *tools.Tools
+	Index *index.Resource
 )
 
 type logWriter struct{}
@@ -145,12 +144,10 @@ func main() {
 	configPath := config.GetConfigPath()
 	fmt.Println("configPath: ", configPath)
 
-	// Launch main loop in a goroutine
-	go loop(configPath)
-
 	// SetupSystray is the main thread
 	configDir := config.GetDefaultConfigDir()
-	Systray = systray.Systray{
+
+	stray := &systray.Systray{
 		Hibernate: *hibernate,
 		Version:   version + "-" + commit,
 		DebugURL: func() string {
@@ -159,18 +156,21 @@ func main() {
 		AdditionalConfig: *additionalConfig,
 		ConfigDir:        configDir,
 	}
-	Systray.SetCurrentConfigFile(configPath)
+	stray.SetCurrentConfigFile(configPath)
+
+	// Launch main loop in a goroutine
+	go loop(stray, configPath)
 
 	if src, err := os.Executable(); err != nil {
 		panic(err)
 	} else if restartPath := updater.Start(src); restartPath != "" {
-		Systray.RestartWith(restartPath)
+		stray.RestartWith(restartPath)
 	} else {
-		Systray.Start()
+		stray.Start()
 	}
 }
 
-func loop(configPath *paths.Path) {
+func loop(stray *systray.Systray, configPath *paths.Path) {
 	if *hibernate {
 		return
 	}
@@ -435,8 +435,8 @@ func loop(configPath *paths.Path) {
 	r.Handle("WS", "/socket.io/", socketHandler)
 	r.Handle("WSS", "/socket.io/", socketHandler)
 	r.GET("/info", infoHandler)
-	r.POST("/pause", pauseHandler)
-	r.POST("/update", updateHandler)
+	r.POST("/pause", PauseHandler(stray))
+	r.POST("/update", UpdateHandler(stray))
 
 	// Mount goa handlers
 	goa := v2.Server(config.GetDataDir().String(), Index)

update.go

@@ -30,20 +30,23 @@
 package main
 
 import (
+	"github.com/arduino/arduino-create-agent/systray"
 	"github.com/arduino/arduino-create-agent/updater"
 	"github.com/gin-gonic/gin"
 )
 
-func updateHandler(c *gin.Context) {
-	restartPath, err := updater.CheckForUpdates(version, *updateURL, *appName)
-	if err != nil {
-		c.JSON(500, gin.H{"error": err.Error()})
-		return
-	}
-	c.JSON(200, gin.H{"success": "Please wait a moment while the agent reboots itself"})
-	if restartPath == "quit" {
-		Systray.Quit()
-	} else {
-		Systray.RestartWith(restartPath)
+func UpdateHandler(s *systray.Systray) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		restartPath, err := updater.CheckForUpdates(version, *updateURL, *appName)
+		if err != nil {
+			c.JSON(500, gin.H{"error": err.Error()})
+			return
+		}
+		c.JSON(200, gin.H{"success": "Please wait a moment while the agent reboots itself"})
+		if restartPath == "quit" {
+			s.Quit()
+		} else {
+			s.RestartWith(restartPath)
+		}
 	}
 }