From 931be80891fcca32b28703017a74e2dc1855c1de Mon Sep 17 00:00:00 2001 From: Nazar Kanaev Date: Thu, 20 Aug 2020 12:06:16 +0100 Subject: [PATCH] ditch shibukawa/configdir --- main.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index c1e3db0..c3bd767 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,6 @@ package main import ( "github.com/nkanaev/yarr/server" "github.com/nkanaev/yarr/storage" - "github.com/shibukawa/configdir" "log" "os" "path/filepath" @@ -12,17 +11,20 @@ import ( func main() { logger := log.New(os.Stdout, "", log.Ldate|log.Ltime|log.Lshortfile) - configDirs := configdir.New("", "yarr") - storageDir := configDirs.QueryFolders(configdir.Global)[0].Path - storageFile := filepath.Join(storageDir, "storage.db") + configPath, err := os.UserConfigDir() + if err != nil { + logger.Fatal("Failed to get config dir: ", err) + } + storagePath := filepath.Join(configPath, "yarr") + storageFile := filepath.Join(storagePath, "storage.db") if err := os.MkdirAll(storageDir, 0755); err != nil { - logger.Fatal(err) + logger.Fatal("Failed to create app config dir: ", err) } db, err := storage.New(storageFile, logger) if err != nil { - logger.Fatal(err) + logger.Fatal("Failed to initialise database: ", err) } srv := server.New(db, logger)