From 44c94d0d725abbc92a038114e5a61425f2cf6d24 Mon Sep 17 00:00:00 2001
From: Romein van Buren <romein@vburen.nl>
Date: Tue, 21 Feb 2023 17:47:21 +0100
Subject: [PATCH] Moved UI methods to their own struct

---
 .../src/components/directorychooser.svelte    |  2 +-
 frontend/src/components/modal.svelte          |  2 +-
 .../src/organisms/connection/index.svelte     |  3 +-
 frontend/wailsjs/go/app/App.d.ts              | 10 ++--
 frontend/wailsjs/go/app/App.js                | 16 ++----
 frontend/wailsjs/go/ui/UI.d.ts                | 13 +++++
 frontend/wailsjs/go/ui/UI.js                  | 23 ++++++++
 internal/app/app.go                           | 53 +++----------------
 internal/ui/dialogs.go                        | 30 +++++++++++
 internal/{open_file => ui}/open.go            |  4 +-
 internal/{open_file => ui}/open_darwin.go     |  2 +-
 internal/{open_file => ui}/open_windows.go    |  2 +-
 internal/ui/ui.go                             | 27 ++++++++++
 main.go                                       | 11 +++-
 14 files changed, 124 insertions(+), 74 deletions(-)
 create mode 100755 frontend/wailsjs/go/ui/UI.d.ts
 create mode 100755 frontend/wailsjs/go/ui/UI.js
 create mode 100644 internal/ui/dialogs.go
 rename internal/{open_file => ui}/open.go (59%)
 rename internal/{open_file => ui}/open_darwin.go (86%)
 rename internal/{open_file => ui}/open_windows.go (85%)
 create mode 100644 internal/ui/ui.go

diff --git a/frontend/src/components/directorychooser.svelte b/frontend/src/components/directorychooser.svelte
index 83f60e0..fc0edf7 100644
--- a/frontend/src/components/directorychooser.svelte
+++ b/frontend/src/components/directorychooser.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { OpenDirectory } from '$wails/go/app/App';
+  import { OpenDirectory } from '$wails/go/ui/UI';
 
   export let value = '';
   export let id = '';
diff --git a/frontend/src/components/modal.svelte b/frontend/src/components/modal.svelte
index 878f6da..b94cc60 100644
--- a/frontend/src/components/modal.svelte
+++ b/frontend/src/components/modal.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <script>
-  import { Beep } from '$wails/go/app/App';
+  import { Beep } from '$wails/go/ui/UI';
   import { fade, fly } from 'svelte/transition';
   import Icon from './icon.svelte';
 
diff --git a/frontend/src/organisms/connection/index.svelte b/frontend/src/organisms/connection/index.svelte
index 0cfad70..b393875 100644
--- a/frontend/src/organisms/connection/index.svelte
+++ b/frontend/src/organisms/connection/index.svelte
@@ -1,7 +1,8 @@
 <script>
   import busy from '$lib/stores/busy';
   import { connections } from '$lib/stores/connections';
-  import { EnterText, Hosts, RenameCollection } from '$wails/go/app/App';
+  import { Hosts, RenameCollection } from '$wails/go/app/App';
+  import { EnterText } from '$wails/go/ui/UI';
   import { EventsOn } from '$wails/runtime/runtime';
   import { onMount } from 'svelte';
   import CollectionDetail from './collection/index.svelte';
diff --git a/frontend/wailsjs/go/app/App.d.ts b/frontend/wailsjs/go/app/App.d.ts
index 0a1d6e5..ca57694 100755
--- a/frontend/wailsjs/go/app/App.d.ts
+++ b/frontend/wailsjs/go/app/App.d.ts
@@ -4,13 +4,13 @@ import {app} from '../models';
 import {primitive} from '../models';
 import {map[string]app} from '../models';
 import {menu} from '../models';
+import {context} from '../models';
+import {ui} from '../models';
 
 export function AddHost(arg1:string):Promise<void>;
 
 export function Aggregate(arg1:string,arg2:string,arg3:string,arg4:string,arg5:string):Promise<void>;
 
-export function Beep():Promise<void>;
-
 export function CreateIndex(arg1:string,arg2:string,arg3:string,arg4:string):Promise<string>;
 
 export function DropCollection(arg1:string,arg2:string,arg3:string):Promise<boolean>;
@@ -19,8 +19,6 @@ export function DropDatabase(arg1:string,arg2:string):Promise<boolean>;
 
 export function DropIndex(arg1:string,arg2:string,arg3:string,arg4:string):Promise<boolean>;
 
-export function EnterText(arg1:string,arg2:string,arg3:string):Promise<string>;
-
 export function Environment():Promise<app.EnvironmentInfo>;
 
 export function FindItems(arg1:string,arg2:string,arg3:string,arg4:string):Promise<app.QueryResult>;
@@ -39,8 +37,6 @@ export function OpenConnection(arg1:string):Promise<Array<string>>;
 
 export function OpenDatabase(arg1:string,arg2:string):Promise<Array<string>>;
 
-export function OpenDirectory(arg1:string,arg2:string):Promise<string>;
-
 export function PerformExport(arg1:string):Promise<boolean>;
 
 export function PurgeLogDirectory():Promise<void>;
@@ -63,6 +59,8 @@ export function SavedQueries():Promise<map[string]app.SavedQuery>;
 
 export function Settings():Promise<app.Settings>;
 
+export function Startup(arg1:context.Context,arg2:ui.UI):Promise<void>;
+
 export function TruncateCollection(arg1:string,arg2:string,arg3:string):Promise<boolean>;
 
 export function UpdateHost(arg1:string,arg2:string):Promise<void>;
diff --git a/frontend/wailsjs/go/app/App.js b/frontend/wailsjs/go/app/App.js
index c3f50d9..5a8cec7 100755
--- a/frontend/wailsjs/go/app/App.js
+++ b/frontend/wailsjs/go/app/App.js
@@ -10,10 +10,6 @@ export function Aggregate(arg1, arg2, arg3, arg4, arg5) {
   return window['go']['app']['App']['Aggregate'](arg1, arg2, arg3, arg4, arg5);
 }
 
-export function Beep() {
-  return window['go']['app']['App']['Beep']();
-}
-
 export function CreateIndex(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['CreateIndex'](arg1, arg2, arg3, arg4);
 }
@@ -30,10 +26,6 @@ export function DropIndex(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['DropIndex'](arg1, arg2, arg3, arg4);
 }
 
-export function EnterText(arg1, arg2, arg3) {
-  return window['go']['app']['App']['EnterText'](arg1, arg2, arg3);
-}
-
 export function Environment() {
   return window['go']['app']['App']['Environment']();
 }
@@ -70,10 +62,6 @@ export function OpenDatabase(arg1, arg2) {
   return window['go']['app']['App']['OpenDatabase'](arg1, arg2);
 }
 
-export function OpenDirectory(arg1, arg2) {
-  return window['go']['app']['App']['OpenDirectory'](arg1, arg2);
-}
-
 export function PerformExport(arg1) {
   return window['go']['app']['App']['PerformExport'](arg1);
 }
@@ -118,6 +106,10 @@ export function Settings() {
   return window['go']['app']['App']['Settings']();
 }
 
+export function Startup(arg1, arg2) {
+  return window['go']['app']['App']['Startup'](arg1, arg2);
+}
+
 export function TruncateCollection(arg1, arg2, arg3) {
   return window['go']['app']['App']['TruncateCollection'](arg1, arg2, arg3);
 }
diff --git a/frontend/wailsjs/go/ui/UI.d.ts b/frontend/wailsjs/go/ui/UI.d.ts
new file mode 100755
index 0000000..a978303
--- /dev/null
+++ b/frontend/wailsjs/go/ui/UI.d.ts
@@ -0,0 +1,13 @@
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+import {context} from '../models';
+
+export function Beep():Promise<void>;
+
+export function EnterText(arg1:string,arg2:string,arg3:string):Promise<string>;
+
+export function OpenDirectory(arg1:string,arg2:string):Promise<string>;
+
+export function Reveal(arg1:string):Promise<void>;
+
+export function Startup(arg1:context.Context):Promise<void>;
diff --git a/frontend/wailsjs/go/ui/UI.js b/frontend/wailsjs/go/ui/UI.js
new file mode 100755
index 0000000..d07e379
--- /dev/null
+++ b/frontend/wailsjs/go/ui/UI.js
@@ -0,0 +1,23 @@
+// @ts-check
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+
+export function Beep() {
+  return window['go']['ui']['UI']['Beep']();
+}
+
+export function EnterText(arg1, arg2, arg3) {
+  return window['go']['ui']['UI']['EnterText'](arg1, arg2, arg3);
+}
+
+export function OpenDirectory(arg1, arg2) {
+  return window['go']['ui']['UI']['OpenDirectory'](arg1, arg2);
+}
+
+export function Reveal(arg1) {
+  return window['go']['ui']['UI']['Reveal'](arg1);
+}
+
+export function Startup(arg1) {
+  return window['go']['ui']['UI']['Startup'](arg1);
+}
diff --git a/internal/app/app.go b/internal/app/app.go
index 702d4c0..b1f34ab 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -3,14 +3,12 @@ package app
 import (
 	"context"
 	"errors"
-	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 
-	"github.com/garraflavatra/rolens/internal/open_file"
-	"github.com/gen2brain/beeep"
+	"github.com/garraflavatra/rolens/internal/ui"
 	"github.com/ncruces/zenity"
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"github.com/wailsapp/wails/v2/pkg/menu/keys"
@@ -32,6 +30,7 @@ type EnvironmentInfo struct {
 
 type App struct {
 	ctx context.Context
+	ui  *ui.UI
 	Env EnvironmentInfo
 }
 
@@ -69,8 +68,9 @@ func NewApp() *App {
 	return a
 }
 
-func (a *App) Startup(ctx context.Context) {
+func (a *App) Startup(ctx context.Context, ui *ui.UI) {
 	a.ctx = ctx
+	a.ui = ui
 	wailsRuntime.LogInfo(a.ctx, "Startup")
 
 	wailsEnv := wailsRuntime.Environment(a.ctx)
@@ -113,8 +113,9 @@ func (a *App) Menu() *menu.Menu {
 	aboutMenu := appMenu.AddSubmenu("About")
 	aboutMenu.AddText("About…", nil, menuEventEmitter(a, "OpenAboutModal"))
 	aboutMenu.AddText("Prefrences…", keys.CmdOrCtrl(","), menuEventEmitter(a, "OpenPrefrences"))
+	aboutMenu.AddText("Open data directory…", nil, func(cd *menu.CallbackData) { a.ui.Reveal(a.Env.DataDirectory) })
 	aboutMenu.AddSeparator()
-	aboutMenu.AddText("Open log directory…", nil, func(cd *menu.CallbackData) { open_file.Reveal(a.Env.LogDirectory) })
+	aboutMenu.AddText("Open log directory…", nil, func(cd *menu.CallbackData) { a.ui.Reveal(a.Env.LogDirectory) })
 	aboutMenu.AddText("Purge logs", nil, func(cd *menu.CallbackData) { a.PurgeLogDirectory() })
 	aboutMenu.AddSeparator()
 	aboutMenu.AddText("Quit", keys.CmdOrCtrl("q"), func(cd *menu.CallbackData) { wailsRuntime.Quit(a.ctx) })
@@ -144,45 +145,3 @@ func (a *App) Menu() *menu.Menu {
 
 	return appMenu
 }
-
-func (a *App) OpenDirectory(id, title string) string {
-	if title == "" {
-		title = "Choose a directory"
-	}
-
-	wailsRuntime.LogInfo(a.ctx, fmt.Sprintf("Opening directory ('%v')", title))
-	dir, err := zenity.SelectFile(zenity.Title(title), zenity.Directory())
-
-	if err != nil && err != zenity.ErrCanceled {
-		wailsRuntime.LogWarning(a.ctx, "Encountered an error while opening directory:")
-		wailsRuntime.LogWarning(a.ctx, err.Error())
-		wailsRuntime.MessageDialog(a.ctx, wailsRuntime.MessageDialogOptions{
-			Type:    wailsRuntime.ErrorDialog,
-			Title:   "Encountered an error while opening directory",
-			Message: err.Error(),
-		})
-	}
-
-	wailsRuntime.LogInfo(a.ctx, "Chosen directory: "+dir)
-	return dir
-}
-
-func (a *App) EnterText(title, info, defaultEntry string) string {
-	input, err := zenity.Entry(info, zenity.Title(title), zenity.EntryText(defaultEntry))
-
-	if err == zenity.ErrCanceled {
-		return ""
-	} else if err != nil {
-		zenity.Error(err.Error(), zenity.Title("Encountered an error!"), zenity.ErrorIcon)
-		return ""
-	} else {
-		return input
-	}
-}
-
-func (a *App) Beep() {
-	if runtime.GOOS == "windows" {
-		return
-	}
-	beeep.Beep(beeep.DefaultFreq, beeep.DefaultDuration)
-}
diff --git a/internal/ui/dialogs.go b/internal/ui/dialogs.go
new file mode 100644
index 0000000..e4cb657
--- /dev/null
+++ b/internal/ui/dialogs.go
@@ -0,0 +1,30 @@
+package ui
+
+import "github.com/ncruces/zenity"
+
+func (u *UI) OpenDirectory(id, title string) string {
+	if title == "" {
+		title = "Choose a directory"
+	}
+
+	dir, err := zenity.SelectFile(zenity.Title(title), zenity.Directory())
+
+	if err != nil && err != zenity.ErrCanceled {
+		zenity.Error("Error while opening directory", zenity.ErrorIcon)
+	}
+
+	return dir
+}
+
+func (u *UI) EnterText(title, info, defaultEntry string) string {
+	input, err := zenity.Entry(info, zenity.Title(title), zenity.EntryText(defaultEntry))
+
+	if err == zenity.ErrCanceled {
+		return ""
+	} else if err != nil {
+		zenity.Error(err.Error(), zenity.Title("Encountered an error!"), zenity.ErrorIcon)
+		return ""
+	} else {
+		return input
+	}
+}
diff --git a/internal/open_file/open.go b/internal/ui/open.go
similarity index 59%
rename from internal/open_file/open.go
rename to internal/ui/open.go
index 156ed68..4760cd1 100644
--- a/internal/open_file/open.go
+++ b/internal/ui/open.go
@@ -1,6 +1,6 @@
-package open_file
+package ui
 
 // Reveal reveals the specified file in the Finder.
-func Reveal(fname string) {
+func (u *UI) Reveal(fname string) {
 	reveal(fname)
 }
diff --git a/internal/open_file/open_darwin.go b/internal/ui/open_darwin.go
similarity index 86%
rename from internal/open_file/open_darwin.go
rename to internal/ui/open_darwin.go
index 45e91d7..9e1ab3a 100644
--- a/internal/open_file/open_darwin.go
+++ b/internal/ui/open_darwin.go
@@ -1,6 +1,6 @@
 //go:build darwin
 
-package open_file
+package ui
 
 import "os/exec"
 
diff --git a/internal/open_file/open_windows.go b/internal/ui/open_windows.go
similarity index 85%
rename from internal/open_file/open_windows.go
rename to internal/ui/open_windows.go
index 02c53ce..f2e36c8 100644
--- a/internal/open_file/open_windows.go
+++ b/internal/ui/open_windows.go
@@ -1,6 +1,6 @@
 //go:build windows
 
-package open_file
+package ui
 
 import "os/exec"
 
diff --git a/internal/ui/ui.go b/internal/ui/ui.go
new file mode 100644
index 0000000..7dfde05
--- /dev/null
+++ b/internal/ui/ui.go
@@ -0,0 +1,27 @@
+package ui
+
+import (
+	"context"
+	"runtime"
+
+	"github.com/gen2brain/beeep"
+)
+
+type UI struct {
+	ctx context.Context
+}
+
+func New() *UI {
+	return &UI{}
+}
+
+func (u *UI) Startup(ctx context.Context) {
+	u.ctx = ctx
+}
+
+func (u *UI) Beep() {
+	if runtime.GOOS == "windows" {
+		return
+	}
+	beeep.Beep(beeep.DefaultFreq, beeep.DefaultDuration)
+}
diff --git a/main.go b/main.go
index 5d1c62a..c65dbb5 100644
--- a/main.go
+++ b/main.go
@@ -1,10 +1,12 @@
 package main
 
 import (
+	"context"
 	"embed"
 	"path"
 
 	"github.com/garraflavatra/rolens/internal/app"
+	uictrl "github.com/garraflavatra/rolens/internal/ui"
 	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/logger"
 	"github.com/wailsapp/wails/v2/pkg/options"
@@ -22,6 +24,8 @@ var (
 
 func main() {
 	app := app.NewApp()
+	ui := uictrl.New()
+
 	err := wails.Run(&options.App{
 		Title: "Rolens",
 
@@ -32,10 +36,13 @@ func main() {
 
 		BackgroundColour: &options.RGBA{R: 0, G: 0, B: 139, A: 1},
 		Menu:             app.Menu(),
-		Bind:             []interface{}{app},
+		Bind:             []interface{}{app, ui},
 		AssetServer:      &assetserver.Options{Assets: assets},
 
-		OnStartup:  app.Startup,
+		OnStartup: func(ctx context.Context) {
+			app.Startup(ctx, ui)
+			ui.Startup(ctx)
+		},
 		OnShutdown: app.Shutdown,
 
 		Logger:             logger.NewFileLogger(path.Join(app.Env.LogDirectory, "rolens.log")),