fix darwin run without config

mpkondrashin · Feb 19, 2024 · c5216df · c5216df
1 parent 42b5b88
commit c5216df
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -14,7 +14,7 @@ jobs:
         run: Get-ChildItem -Recurse | Format-Table -Property Mode, LastWriteTime, Length, FullName
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: 1.21.5
 
@@ -45,7 +45,7 @@ jobs:
         run: ls -lR
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: 1.21.5
 
@@ -77,7 +77,7 @@ jobs:
         run: ls -lR
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: 1.21.5
 

diff --git a/cmd/sandboxer/main.go b/cmd/sandboxer/main.go
@@ -9,6 +9,7 @@ Sandboxer main file
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -43,8 +44,8 @@ type SandboxerApp struct {
 
 	submissionsWindow *ModalWindow
 	//quotaWindow       *QuotaWindow
-	//optionsWindow     *OptionsWindow
-	updateWindow *ModalWindow
+	optionsWindow *ModalWindow
+	updateWindow  *ModalWindow
 	//aboutWindow  *AboutWindow
 }
 
@@ -79,13 +80,13 @@ func NewSandboxingApp(conf *config.Configuration, channels *task.Channels, list
 		}, a.optionsWindow.win)
 	})
 	*/
-	optionsWindow := NewModalWindow(NewOptionsWindow(conf), &a.TrayApp)
+	a.optionsWindow = NewModalWindow(NewOptionsWindow(conf), &a.TrayApp)
 
 	a.menu = fyne.NewMenu(globals.AppName,
 		// SUBMIT_FILE s.submitMenuItem,
 		a.submissionsWindow.MenuItem,
 		quotaWindow.MenuItem,
-		optionsWindow.MenuItem,
+		a.optionsWindow.MenuItem,
 		fyne.NewMenuItemSeparator(),
 		a.updateWindow.MenuItem,
 		aboutWindow.MenuItem,
@@ -101,10 +102,23 @@ func (a *SandboxerApp) Icon() fyne.Resource {
 	return ApplicationIcon
 }
 
+func (s *SandboxerApp) ShowOptions() {
+	confPath, err := globals.ConfigurationFilePath()
+	if err != nil {
+		logging.Errorf("ConfigurationFilePath: %v", err)
+		return
+	}
+	if _, err := os.Stat(confPath); errors.Is(err, os.ErrNotExist) {
+		logging.Errorf("Configuration is missing: %v", err)
+		s.optionsWindow.Show()
+	}
+}
+
 func (s *SandboxerApp) Run() {
 	if len(os.Args) == 2 && os.Args[1] == "--submissions" {
 		s.submissionsWindow.Show()
 	}
+	s.ShowOptions()
 	go s.CheckUpdate()
 	s.app.Run()
 }
@@ -167,7 +181,7 @@ func main() {
 		os.Exit(globals.ExitGetConfigurationFileathError)
 	}
 	conf := config.New(configFilePath)
-	if err := conf.Load(); err != nil {
+	if err := conf.Load(); err != nil && !errors.Is(err, os.ErrNotExist) {
 		fmt.Fprintf(os.Stderr, "conf.Load: %v", err)
 		os.Exit(globals.ExitLoadConfigError)
 	}

diff --git a/cmd/submit/main.go b/cmd/submit/main.go
@@ -87,8 +87,10 @@ func main() {
 	}
 	conf := config.New(configFilePath)
 	if err := conf.Load(); err != nil {
-		fmt.Fprintf(os.Stderr, "conf.Load: %v", err)
-		os.Exit(20)
+		if runtime.GOOS == "windows" {
+			fmt.Fprintf(os.Stderr, "conf.Load: %v", err)
+			os.Exit(20)
+		}
 	}
 	//close := logging.NewFileLog(conf.LogFolder(), submitLog)
 	closeLogging, err := globals.SetupLogging(submitLog)

diff --git a/pkg/dispatchers/wait_dispatch.go b/pkg/dispatchers/wait_dispatch.go
@@ -33,8 +33,6 @@ func (*WaitDispatch) InboundChannel() task.Channel {
 }
 
 func (d *WaitDispatch) ProcessTask(tsk *task.Task) error {
-	//tsk.SetState(task.StateCheck)
-
 	vOne, err := d.vOne()
 	if err != nil {
 		return err
@@ -45,6 +43,7 @@ func (d *WaitDispatch) ProcessTask(tsk *task.Task) error {
 		return fmt.Errorf("SandboxSubmissionStatus: %w", err)
 	}
 	tsk.Deactivate()
+	d.list.Updated()
 	logging.Debugf("%s Status: %v", tsk.SandboxID, status.Status)
 	switch status.Status {
 	case vone.StatusSucceeded: