From 1d81151327559cd1c26d505e1c046ec9658097c0 Mon Sep 17 00:00:00 2001 From: fgsfds <4870330+fgsfds@users.noreply.github.com> Date: Sat, 9 Aug 2025 21:27:33 +0500 Subject: [PATCH] added getWindowsDbPath() func --- config/config.go | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/config/config.go b/config/config.go index 0fa2984d..832f57e5 100644 --- a/config/config.go +++ b/config/config.go @@ -18,6 +18,9 @@ var version string //go:embed name var name string +// default folder for database +var defaultDbFolder = "/etc/x-ui" + type LogLevel string const ( @@ -77,28 +80,30 @@ func getDBFolderPath() string { return dbFolderPath } - defaultFolder := "/etc/x-ui" - if runtime.GOOS == "windows" { - homeDir := os.Getenv("LOCALAPPDATA") - if homeDir == "" { - logger.Error("Error while getting local app data folder") - return defaultFolder - } - - userFolder := filepath.Join(homeDir, "x-ui") - err := moveExistingDb(defaultFolder, userFolder) - if err != nil { - logger.Error("Error while moving existing DB: %w", err) - return defaultFolder - } - - return userFolder + return getWindowsDbPath() } else { - return defaultFolder + return defaultDbFolder } } +func getWindowsDbPath() string { + homeDir := os.Getenv("LOCALAPPDATA") + if homeDir == "" { + logger.Errorf("Error while getting local app data folder, falling back to %s", defaultDbFolder) + return defaultDbFolder + } + + userFolder := filepath.Join(homeDir, "x-ui") + err := moveExistingDb(defaultDbFolder, userFolder) + if err != nil { + logger.Error("Error while moving existing DB: %w, falling back to %s", err, defaultDbFolder) + return defaultDbFolder + } + + return userFolder +} + func moveExistingDb(from string, to string) error { if _, err := os.Stat(to); os.IsNotExist(err) { if _, err := os.Stat(from); !os.IsNotExist(err) {