use consts for HOME and AyanDict

ilius · Feb 25, 2024 · 922129a · 922129a
1 parent aa8344d
commit 922129a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 12 deletions.
diff --git a/pkg/appinfo/app_info.go b/pkg/appinfo/app_info.go
@@ -1,8 +1,10 @@
 package appinfo
 
-const APP_NAME = "ayandict"
-
-const VERSION = "v2.0.0"
+const (
+	APP_NAME = "ayandict"
+	APP_DESC = "AyanDict"
+	VERSION  = "v2.0.0"
+)
 
 const ABOUT = `AyanDict is simple dictionary application based on Qt and written in Go.
 

diff --git a/pkg/application/app.go b/pkg/application/app.go
@@ -7,6 +7,7 @@ import (
 
 	// "github.com/ilius/qt/webengine"
 
+	"github.com/ilius/ayandict/v2/pkg/appinfo"
 	"github.com/ilius/ayandict/v2/pkg/config"
 	"github.com/ilius/ayandict/v2/pkg/dictmgr"
 	"github.com/ilius/ayandict/v2/pkg/dictmgr/qdictmgr"
@@ -110,7 +111,7 @@ func (app *Application) Run() {
 	// icon := gui.NewQIcon5("./img/icon.png")
 
 	window := app.window
-	window.SetWindowTitle("AyanDict")
+	window.SetWindowTitle(appinfo.APP_DESC)
 	window.Resize2(600, 400)
 
 	entry := widgets.NewQLineEdit(nil)

diff --git a/pkg/config/paths_mac.go b/pkg/config/paths_mac.go
@@ -6,15 +6,17 @@ package config
 import (
 	"os"
 	"path/filepath"
+
+	"github.com/ilius/ayandict/v2/pkg/appinfo"
 )
 
 func platformConfigDir() string {
 	return filepath.Join(
-		os.Getenv("HOME"),
+		os.Getenv(S_HOME),
 		"Library/Preferences/AyanDict",
 	)
 }
 
 func GetCacheDir() string {
-	return filepath.Join(os.Getenv("HOME"), "Library", "Caches", "AyanDict")
+	return filepath.Join(os.Getenv(S_HOME), "Library", "Caches", appinfo.APP_DESC)
 }
diff --git a/pkg/config/paths_unix.go b/pkg/config/paths_unix.go
@@ -6,16 +6,18 @@ package config
 import (
 	"os"
 	"path/filepath"
+
+	"github.com/ilius/ayandict/v2/pkg/appinfo"
 )
 
 func platformConfigDir() string {
 	parent := os.Getenv("XDG_CONFIG_HOME")
 	if parent == "" {
-		parent = filepath.Join(os.Getenv("HOME"), ".config")
+		parent = filepath.Join(os.Getenv(S_HOME), ".config")
 	}
-	return filepath.Join(parent, "ayandict")
+	return filepath.Join(parent, appinfo.APP_DESC)
 }
 
 func GetCacheDir() string {
-	return filepath.Join(os.Getenv("HOME"), ".cache", "ayandict")
+	return filepath.Join(os.Getenv(S_HOME), ".cache", appinfo.APP_DESC)
 }
diff --git a/pkg/config/paths_windows.go b/pkg/config/paths_windows.go
@@ -7,6 +7,8 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+
+	"github.com/ilius/ayandict/v2/pkg/appinfo"
 )
 
 func platformConfigDir() string {
@@ -16,7 +18,7 @@ func platformConfigDir() string {
 	// user := os.Getenv("USERNAME")
 	// tmpDir := os.Getenv("TEMP")
 	appData := os.Getenv("APPDATA")
-	confDir := filepath.Join(appData, "AyanDict")
+	confDir := filepath.Join(appData, appinfo.APP_DESC)
 	return confDir
 }
 
@@ -32,5 +34,5 @@ func GetCacheDir() string {
 			return ""
 		}
 	}
-	return filepath.Join(localAppData, "AyanDict", "Cache")
+	return filepath.Join(localAppData, appinfo.APP_DESC, "Cache")
 }
diff --git a/pkg/config/strings.go b/pkg/config/strings.go
@@ -0,0 +1,3 @@
+package config
+
+const S_HOME = "HOME"
diff --git a/pkg/qsettings/settings.go b/pkg/qsettings/settings.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ilius/ayandict/v2/pkg/appinfo"
 	"github.com/ilius/ayandict/v2/pkg/qerr"
 	"github.com/ilius/qt/core"
 	"github.com/ilius/qt/gui"
@@ -59,7 +60,7 @@ func splitterSizes(splitter *widgets.QSplitter) []int {
 }
 
 func GetQSettings(parent core.QObject_ITF) *core.QSettings {
-	return core.NewQSettings("ilius", "ayandict", parent)
+	return core.NewQSettings("ilius", appinfo.APP_NAME, parent)
 }
 
 func restoreSetting(qs *core.QSettings, key string, apply func(*core.QVariant)) {