Merge pull request #2 from phendryx/auto-update

add menubar icon for macos with show log option

Author: phendryx

.gitignore

@@ -15,5 +15,7 @@ act.sh
 albiondata-client*
 buildall.sh
 run.sh
+*.log
+*.log.*
 
 

albiondata-client.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 	"time"
 
@@ -27,8 +28,19 @@ func main() {
 
 	startUpdater()
 
-	go systray.Run()
+	// On macOS, the systray requires the Cocoa event loop to run on the main thread.
+	// So we run the client in a goroutine and systray on the main thread.
+	// On other platforms, we do the opposite for backward compatibility.
+	if runtime.GOOS == "darwin" {
+		go runClient()
+		systray.Run() // This blocks on the main thread (required for macOS)
+	} else {
+		go systray.Run()
+		runClient()
+	}
+}
 
+func runClient() {
 	c := client.NewClient(version)
 	err := c.Run()
 	if err != nil {
@@ -37,7 +49,6 @@ func main() {
 		var b = make([]byte, 1)
 		_, _ = os.Stdin.Read(b)
 	}
-
 }
 
 func startUpdater() {

client/config.go

@@ -2,8 +2,11 @@ package client
 
 import (
 	"flag"
+	"fmt"
 	"io"
 	"os"
+	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -14,6 +17,33 @@ import (
 	"github.com/spf13/viper"
 )
 
+const (
+	logFileName = "albiondata-client.log"
+	maxLogFiles = 10
+)
+
+// ansiStripWriter wraps an io.Writer and strips ANSI escape codes before writing
+type ansiStripWriter struct {
+	writer io.Writer
+	regex  *regexp.Regexp
+}
+
+// newAnsiStripWriter creates a writer that strips ANSI escape codes
+func newAnsiStripWriter(w io.Writer) *ansiStripWriter {
+	return &ansiStripWriter{
+		writer: w,
+		// Matches ANSI escape sequences like \x1b[0m, \x1b[36m, etc.
+		regex: regexp.MustCompile(`\x1b\[[0-9;]*m`),
+	}
+}
+
+func (w *ansiStripWriter) Write(p []byte) (n int, err error) {
+	stripped := w.regex.ReplaceAll(p, []byte{})
+	_, err = w.writer.Write(stripped)
+	// Return original length to satisfy io.Writer contract
+	return len(p), err
+}
+
 type config struct {
 	AllowedWSHosts                 []string
 	Debug                          bool
@@ -29,7 +59,6 @@ type config struct {
 	EnableWebsockets               bool
 	ListenDevices                  string
 	LogLevel                       string
-	LogToFile                      bool
 	Minimize                       bool
 	Offline                        bool
 	OfflinePath                    string
@@ -179,13 +208,6 @@ func (config *config) setupCommonFlags() {
 		"Listen on this comma separated devices instead of all available. (Windows: Use MAC-Address, Linux: Use interface name)",
 	)
 
-	flag.BoolVar(
-		&config.LogToFile,
-		"output-file",
-		false,
-		"Enable logging to file.",
-	)
-
 	flag.StringVar(
 		&config.OfflinePath,
 		"o",
@@ -237,19 +259,53 @@ func (config *config) setupLogs() {
 
 	log.SetLevel(level)
 
-	if config.LogToFile {
-		log.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true, DisableSorting: true, ForceColors: false})
-		f, err := os.OpenFile("albiondata-client-output.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0755)
-		if err == nil {
-			multiWriter := io.MultiWriter(os.Stdout, f)
-			log.SetOutput(multiWriter)
-		} else {
-			log.SetOutput(os.Stdout)
-		}
+	// Rotate existing log files before creating new one
+	rotateLogFiles()
+
+	// Always log to both file and terminal
+	// Use colors for terminal, strip ANSI codes for file
+	log.SetFormatter(&logrus.TextFormatter{FullTimestamp: true, DisableSorting: true, ForceColors: true})
+	f, err := os.OpenFile(logFileName, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+	if err == nil {
+		// Wrap file writer to strip ANSI codes
+		strippedFileWriter := newAnsiStripWriter(f)
+		multiWriter := io.MultiWriter(colorable.NewColorableStdout(), strippedFileWriter)
+		log.SetOutput(multiWriter)
 	} else {
-		log.SetFormatter(&logrus.TextFormatter{FullTimestamp: true, DisableSorting: true, ForceColors: true})
 		log.SetOutput(colorable.NewColorableStdout())
+		log.Warnf("Could not create log file: %v", err)
+	}
+}
+
+// rotateLogFiles moves the current log file to a numbered backup and removes old backups
+func rotateLogFiles() {
+	// Check if current log file exists
+	if _, err := os.Stat(logFileName); os.IsNotExist(err) {
+		return // No log file to rotate
+	}
+
+	// Remove the oldest log file if we're at the limit
+	oldestLog := fmt.Sprintf("%s.%d", logFileName, maxLogFiles)
+	_ = os.Remove(oldestLog)
+
+	// Shift all existing log files up by one number
+	for i := maxLogFiles - 1; i >= 1; i-- {
+		oldName := fmt.Sprintf("%s.%d", logFileName, i)
+		newName := fmt.Sprintf("%s.%d", logFileName, i+1)
+		_ = os.Rename(oldName, newName)
+	}
+
+	// Rename current log file to .1
+	_ = os.Rename(logFileName, fmt.Sprintf("%s.1", logFileName))
+}
+
+// GetLogFilePath returns the full path to the current log file
+func GetLogFilePath() string {
+	absPath, err := filepath.Abs(logFileName)
+	if err != nil {
+		return logFileName
 	}
+	return absPath
 }
 
 func (config *config) setupDebugEvents() {

icon/icondarwin.go

@@ -0,0 +1,12 @@
+//go:build darwin
+
+// File generated from icon/albiondata-client.png
+
+package icon
+
+import (
+	_ "embed"
+)
+
+//go:embed albiondata-client.png
+var Data []byte

systray/systray_darwin.go

@@ -0,0 +1,76 @@
+//go:build darwin
+
+package systray
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/ao-data/albiondata-client/icon"
+	"github.com/ao-data/albiondata-client/log"
+	"github.com/getlantern/systray"
+)
+
+var ConsoleHidden bool = false
+
+const CanHideConsole = false
+
+func HideConsole() {
+	// Not supported on macOS
+}
+
+func ShowConsole() {
+	// Not supported on macOS
+}
+
+func Run() {
+	systray.Run(onReady, onExit)
+}
+
+func onExit() {
+	// Cleanup if needed
+}
+
+func onReady() {
+	systray.SetIcon(icon.Data)
+	systray.SetTitle("") // Clear text since we have an icon now
+	systray.SetTooltip("Albion Data Client")
+
+	mOpenLog := systray.AddMenuItem("Open Log File", "Open the log file in default viewer")
+	systray.AddSeparator()
+	mQuit := systray.AddMenuItem("Quit", "Close the Albion Data Client")
+
+	go func() {
+		for {
+			select {
+			case <-mOpenLog.ClickedCh:
+				openLogFile()
+
+			case <-mQuit.ClickedCh:
+				fmt.Println("Requesting quit")
+				systray.Quit()
+				os.Exit(0)
+			}
+		}
+	}()
+}
+
+func openLogFile() {
+	// Try to find and open the log file
+	logFile := "albiondata-client.log"
+	
+	// Check current directory first
+	if _, err := os.Stat(logFile); err == nil {
+		absPath, _ := filepath.Abs(logFile)
+		cmd := exec.Command("open", absPath)
+		if err := cmd.Start(); err != nil {
+			log.Errorf("Failed to open log file: %v", err)
+		}
+		return
+	}
+	
+	// If no log file exists, show a message
+	log.Info("No log file found yet.")
+}

systray/systray_others.go

@@ -1,4 +1,4 @@
-// +build linux darwin
+//go:build linux
 
 package systray
 

systray/systray_win.go

@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package systray