Merge branch 'master' of https://github.com/fexaop/whats4linux

Author: Fexaop

.gitignore

@@ -5,6 +5,7 @@ frontend/wailsjs
 .DS_Store
 .env
 whats4linux
+whats4linux_tray
 wa.db
 wa.db.1
 vendor
@@ -13,3 +14,4 @@ systray/systray
 result
 .pkg-config-wrapped
 .wails-wrapped
+*.AppImage

api/api.go

@@ -54,14 +54,18 @@ func (a *Api) Startup(ctx context.Context) {
 	if err != nil {
 		panic(err)
 	}
-	// start systray
 	go func() {
 		err := a.us.ListenAndServe()
 		if err != nil {
 			log.Println("Unix socket server error:", err)
 		}
 	}()
 
+	err = misc.StartSystray()
+	if err != nil {
+		panic(err)
+	}
+
 	a.ctx = ctx
 	dbLog := waLog.Stdout("Database", settings.GetLogLevel(), true)
 	a.cw, err = wa.NewAppDatabase(ctx)

internal/misc/systray_linux.go

@@ -0,0 +1,26 @@
+//go:build linux
+// +build linux
+
+package misc
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
+func StartSystray() error {
+	appDir := os.Getenv("APPDIR")
+	if appDir == "" {
+		return fmt.Errorf("APPDIR not set")
+	}
+
+	trayPath := filepath.Join(appDir, "usr", "bin", "whats4linux_tray")
+
+	cmd := exec.Command(trayPath)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	return cmd.Start()
+}

internal/misc/systray_windows.go

@@ -0,0 +1,11 @@
+//go:build !linux
+// +build !linux
+
+package misc
+
+import "log"
+
+func StartSystray() error {
+	log.Println("Systray is not supported on this platform")
+	return nil
+}

packaging/AppImage/AppDir/.DirIcon

@@ -0,0 +1 @@
+whats4linux.png

packaging/AppImage/AppDir/AppRun

@@ -0,0 +1,3 @@
+#!/bin/sh
+HERE="$(dirname "$(readlink -f "$0")")"
+exec "$HERE/usr/bin/whats4linux" "$@" 

packaging/AppImage/AppDir/usr/bin/.gitkeep

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Whats4Linux
+Exec=whats4linux
+Icon=whats4linux
+Terminal=false
+Categories=Network;

packaging/AppImage/AppDir/usr/share/applications/whats4linux.desktop

@@ -0,0 +1 @@
+./usr/share/applications/whats4linux.desktop