[UPD] Ask for user confirmation before quitting in all cases

Previously, when quitting the application on macOS without using the menu, the confirmation dialog was not being called and the app was hidden instead. Now, for each case, we ask for confirmation and if not confirmed, the window is minimized.
On macOS, hiding the window does not allow the user to display the window again when clicking the icon.

Author: stva-odoo

app.go

@@ -23,12 +23,11 @@ type App struct {
 	webserver      *server.Server
 	config         *config.Manager
 	printerManager *printer.Manager
-	allowClose     bool
 	autoStart      *autostart.App
 }
 
 func NewApp() *App {
-	a := &App{allowClose: false}
+	a := &App{}
 
 	a.autoStart = &autostart.App{
 		Name:        "epos-proxy",
@@ -214,12 +213,6 @@ func (a *App) CheckLANPrinterStatus(ip string) bool {
 	return printer.CheckLANPrinter(ip) == nil
 }
 
-func (a *App) Quit() {
-	logger.Infof("Quit requested by user")
-	a.allowClose = true
-	wailsruntime.Quit(a.ctx)
-}
-
 func (a *App) DownloadLogs() {
 	logger.Debugf("Download logs requested")
 	logDir := logger.LogDirectory()

logger/logger.go

@@ -3,57 +3,55 @@ package logger
 import (
 	"os"
 	"path/filepath"
-	"time"
 
 	"github.com/sirupsen/logrus"
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-var Log = logrus.New()
+var log = logrus.New()
 
 var logDir string
 
 func InitLogger() {
 	dir, err := os.UserConfigDir()
 	if err != nil {
-		Log.Fatalf("Failed to get user config dir: %v", err)
+		Fatalf("Failed to get user config dir: %v", err)
 	}
 	logDir = filepath.Join(dir, "epos-proxy", "logs")
 	if err := os.MkdirAll(logDir, 0755); err != nil {
-		Log.Fatalf("Failed to create log directory: %v", err)
+		Fatalf("Failed to create log directory: %v", err)
 	}
 
 	filename := filepath.Join(logDir, "epos-proxy.log")
 
-	Log.SetOutput(&lumberjack.Logger{
+	log.SetOutput(&lumberjack.Logger{
 		Filename:   filename,
 		MaxSize:    20, // MB
 		MaxBackups: 5,  // keep last x files
 		MaxAge:     5,  // days
 		Compress:   false,
 	})
 
-	Log.SetReportCaller(true)
+	// log.SetReportCaller(true)
 
-	Log.SetFormatter(&logrus.TextFormatter{
+	log.SetFormatter(&logrus.TextFormatter{
 		FullTimestamp: true,
 	})
 
-	Log.SetLevel(logrus.InfoLevel)
-
-	Log.Info("Logger initialized at ", time.Now())
+	log.SetLevel(logrus.InfoLevel)
+	Info("Logger initialized")
 }
 
 // Wrappers
-func Info(args ...interface{})                  { Log.Info(args...) }
-func Infof(format string, args ...interface{})  { Log.Infof(format, args...) }
-func Warn(args ...interface{})                  { Log.Warn(args...) }
-func Warnf(format string, args ...interface{})  { Log.Warnf(format, args...) }
-func Error(args ...interface{})                 { Log.Error(args...) }
-func Errorf(format string, args ...interface{}) { Log.Errorf(format, args...) }
-func Fatal(args ...interface{})                 { Log.Fatal(args...) }
-func Fatalf(format string, args ...interface{}) { Log.Fatalf(format, args...) }
-func Debug(args ...interface{})                 { Log.Debug(args...) }
-func Debugf(format string, args ...interface{}) { Log.Debugf(format, args...) }
+func Info(args ...interface{})                  { log.Info(args...) }
+func Infof(format string, args ...interface{})  { log.Infof(format, args...) }
+func Warn(args ...interface{})                  { log.Warn(args...) }
+func Warnf(format string, args ...interface{})  { log.Warnf(format, args...) }
+func Error(args ...interface{})                 { log.Error(args...) }
+func Errorf(format string, args ...interface{}) { log.Errorf(format, args...) }
+func Fatal(args ...interface{})                 { log.Fatal(args...) }
+func Fatalf(format string, args ...interface{}) { log.Fatalf(format, args...) }
+func Debug(args ...interface{})                 { log.Debug(args...) }
+func Debugf(format string, args ...interface{}) { log.Debugf(format, args...) }
 
 func LogDirectory() string { return logDir }

main.go

@@ -55,13 +55,14 @@ func main() {
 			},
 		},
 		OnBeforeClose: func(ctx context.Context) (prevent bool) {
-			if !app.allowClose {
-				logger.Infof("Close requested, hiding window instead of quitting")
-				wailsruntime.WindowHide(ctx)
-				return true
+			if app.ConfirmQuit() {
+				logger.Infof("User confirmed quit")
+				return false
 			}
-			logger.Infof("Application closing")
-			return false
+
+			logger.Infof("Close requested, minimizing window instead of quitting")
+			wailsruntime.WindowMinimise(ctx)
+			return true
 		},
 		BackgroundColour: &options.RGBA{R: 255, G: 255, B: 255, A: 1},
 		OnStartup:        app.startup,

menu.go

@@ -20,7 +20,8 @@ func createMenu(app *App) *menu.Menu {
 	})
 
 	appMenu.AddText("Quit", nil, func(_ *menu.CallbackData) {
-		handleQuit(app)
+		logger.Infof("Quit requested by user")
+		wailsruntime.Quit(app.ctx)
 	})
 
 	return mainMenu
@@ -43,9 +44,7 @@ func handleAutoStartToggle(app *App, cb *menu.CallbackData) {
 	}
 }
 
-func handleQuit(app *App) {
-	logger.Debug("Quit menu item selected")
-
+func (app *App) ConfirmQuit() bool {
 	result, err := wailsruntime.MessageDialog(app.ctx, wailsruntime.MessageDialogOptions{
 		Type:          wailsruntime.QuestionDialog,
 		Title:         "Quit ePOS Proxy",
@@ -56,14 +55,14 @@ func handleQuit(app *App) {
 
 	if err != nil {
 		logger.Errorf("Failed to show quit dialog: %v", err)
-		return
+		return false
 	}
 
-	// linux doesnot use Buttons ovverrides and uses No | Yes for quetion dialog
+	// linux doesn't use Buttons overrides and uses No | Yes for question dialog
 	if result != "Yes" && result != "Quit" {
-		return
+		return false
 	}
 
 	logger.Debug("Confirmed quit action")
-	app.Quit()
+	return true
 }