rework fyne systray menu

Author: peterjah

.github/workflows/build.yml

@@ -95,7 +95,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: massastation_${{ matrix.target }}_${{ matrix.arch }}_package
-          path: MassaStation.tar.xz
+          path: massastation.tar.xz
           if-no-files-found: error
           retention-days: 1
 

Taskfile.yml

@@ -109,7 +109,7 @@ tasks:
     desc: Packages MassaStation using fyne
     platforms: [linux, darwin]
     cmds:
-      - cmd: fyne package -name MassaStation -icon ../../int/systray/embedded/logo.png --app-id net.massalabs.massastation -src ./cmd/massastation {{if .OS}}--os {{.OS}}{{end}}
+      - cmd: fyne package -src ./cmd/massastation -icon ../../int/systray/embedded/logo.png {{if .OS}}--os {{.OS}}{{end}}
 
   generate-dirs:
     desc: Generates required directories for MassaStation

cmd/massastation/fyne_metadata_init.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"strings"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/app"
+
+	"github.com/massalabs/station/int/config"
+	"github.com/massalabs/station/int/systray/embedded"
+)
+
+func init() {
+	app.SetMetadata(fyne.AppMetadata{
+		ID:      "net.massalabs.massastation",
+		Name:    "MassaStation",
+		Version: config.Version,
+		Build:   1,
+		Icon: &fyne.StaticResource{
+			StaticName:    "logo.png",
+			StaticContent: embedded.Logo,
+		},
+		Release: !strings.Contains(config.Version, "dev"),
+	})
+}

installer/deb/create_deb.sh

@@ -8,7 +8,7 @@ BUILD_DIR=builddeb
 TMP_DIR=tmpdeb
 PKGVERSION=0.0.0-dev
 
-MASSASTATION_ARCHIVE_NAME=MassaStation.tar.xz
+MASSASTATION_ARCHIVE_NAME=massastation.tar.xz
 MASSASTATION_BINARY_NAME=massastation
 
 # Print error message to stderr and exit with code 1.
@@ -19,7 +19,8 @@ fatal() {
 
 # Install dependencies required to build the MassaStation binary.
 install_massastation_build_dependencies() {
-    sudo apt-get install libgl1-mesa-dev xorg-dev -y || fatal "failed to install libgl1-mesa-dev xorg-dev"
+    sudo apt-get update || fatal "failed to update apt"
+    sudo apt-get install -y --fix-missing libgl1-mesa-dev xorg-dev || fatal "failed to install libgl1-mesa-dev xorg-dev"
     go install fyne.io/tools/cmd/fyne@v1.7.0 || fatal "failed to install fyne.io/tools/cmd/fyne@v1.7.0"
     go install github.com/go-swagger/go-swagger/cmd/swagger@latest || fatal "failed to install github.com/go-swagger/go-swagger/cmd/swagger@latest"
     go install golang.org/x/tools/cmd/stringer@latest || fatal "failed to install golang.org/x/tools/cmd/stringer@latest"
@@ -29,11 +30,13 @@ install_massastation_build_dependencies() {
 build_massastation() {
     install_massastation_build_dependencies
 
+    # Ensure go install binaries are in PATH
+    export PATH="$PATH:$(go env GOPATH)/bin"
+
     go generate ../... || fatal "go generate failed for $MASSASTATION_BINARY_NAME"
     export GOARCH=$ARCH
     export CGO_ENABLED=1
-    # -icon is based on the path of the -src flag.
-    fyne package -icon ../../int/systray/embedded/logo.png -name MassaStation --app-id com.massalabs.massastation -src ../cmd/massastation || fatal "fyne package failed for $MASSASTATION_BINARY_NAME"
+    fyne package -src ../cmd/massastation -icon ../../int/systray/embedded/logo.png || fatal "fyne package failed for $MASSASTATION_BINARY_NAME"
 }
 
 # Delete the build directory if it exists.

installer/macos/create_pkg.sh

@@ -49,8 +49,7 @@ build_massastation() {
     go generate ../... || fatal "go generate failed for $MASSASTATION_APPLICATION_NAME"
     export GOARCH=$ARCH
     export CGO_ENABLED=1
-    # -icon is based on the path of the -src flag.
-    fyne package -icon ../../int/systray/embedded/logo.png -name MassaStation --app-id com.massalabs.massastation -src ../cmd/massastation || fatal "fyne package failed for $MASSASTATION_APPLICATION_NAME"
+    fyne package -src ../cmd/massastation -icon ../../int/systray/embedded/logo.png || fatal "fyne package failed for $MASSASTATION_APPLICATION_NAME"
     chmod +x $MASSASTATION_APPLICATION_NAME || fatal "failed to chmod $MASSASTATION_APPLICATION_NAME"
 }
 

int/systray/systray.go

@@ -11,36 +11,26 @@ import (
 
 func MakeGUI() (fyne.App, *fyne.Menu) {
 	stationGUI := app.New()
-	menu := fyne.NewMenu("MassaStation")
 
 	if desk, ok := stationGUI.(fyneDesktop.App); ok {
 		icon := fyne.NewStaticResource("logo", embedded.Logo)
-		titleMenu := fyne.NewMenuItem("MassaStation", nil)
-		homeShortCutMenu := fyne.NewMenuItem("Open MassaStation", nil)
-		testMenu := fyne.NewMenuItem("Test", nil)
-
-		titleMenu.Disabled = true
-		titleMenu.Icon = icon
-
-		testMenu.Action = func() {
-			notification := fyne.NewNotification("Test notification", "This is a test notification from MassaStation")
-			stationGUI.SendNotification(notification)
-		}
 
+		homeShortCutMenu := fyne.NewMenuItem("Open MassaStation", nil)
 		homeShortCutMenu.Action = func() {
 			utils.OpenURL(&stationGUI, "https://"+config.MassaStationURL)
 		}
 
-		menu.Items = append(menu.Items,
-			titleMenu,
+		menu := fyne.NewMenu(
+			"MassaStation",
 			fyne.NewMenuItemSeparator(),
 			homeShortCutMenu,
-			// testMenu,
 		)
 
 		desk.SetSystemTrayIcon(icon)
 		desk.SetSystemTrayMenu(menu)
+
+		return stationGUI, menu
 	}
 
-	return stationGUI, menu
+	return stationGUI, nil
 }

int/systray/update/update_check.go

@@ -125,6 +125,12 @@ func StartUpdateCheck(app *fyne.App, systrayMenu *fyne.Menu) {
 		return
 	}
 
+	// If systrayMenu is nil (e.g., desktop interface assertion failed), skip update checks.
+	if systrayMenu == nil {
+		logger.Debug("Systray menu is nil, skipping update checks")
+		return
+	}
+
 	// We check for updates on startup.
 	updateCheck(app, systrayMenu)