From 64dddab2f494855f197313dc79aa5ab26f9274cd Mon Sep 17 00:00:00 2001 From: Masudur Rahman Date: Mon, 26 Feb 2024 15:00:37 +0600 Subject: [PATCH] Move sqlite db file to .expense-tracker directory Signed-off-by: Masudur Rahman --- .gitignore | 2 +- configs/database.go | 2 +- modules/google/drive.go | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 01c7a67..1a1c4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,4 @@ bin/ .container-* .dockerfile-* -expense-tracker.db +.expense-tracker/expense-tracker.db diff --git a/configs/database.go b/configs/database.go index 38dba75..955bb08 100644 --- a/configs/database.go +++ b/configs/database.go @@ -50,7 +50,7 @@ func InitiateDatabaseConnection(ctx context.Context) error { } func getSQLiteDatabase(ctx context.Context) (isql.Database, error) { - conn, err := lib.GetSQLiteConnection("expense-tracker.db") + conn, err := lib.GetSQLiteConnection(google.DatabasePath()) if err != nil { return nil, err } diff --git a/modules/google/drive.go b/modules/google/drive.go index 6dc87ad..b570838 100644 --- a/modules/google/drive.go +++ b/modules/google/drive.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "io" + "log" "os" "path/filepath" "strings" @@ -21,6 +22,13 @@ const ( dbFolderName = ".expense-tracker" ) +func DatabasePath() string { + if err := os.MkdirAll(dbFolderName, os.ModePerm); err != nil { + log.Fatalln(err) + } + return filepath.Join(dbFolderName, dbFileName) +} + func getDriveService() (*drive.Service, error) { creds, err := google.FindDefaultCredentials(context.Background(), drive.DriveScope) if err != nil { @@ -110,13 +118,12 @@ func SyncDatabaseFromDrive() error { return err } - upstreamDBPath := fmt.Sprintf("%s/%s", dbFolderName, dbFileName) - data, err := readFileFromDrive(svc, upstreamDBPath) + data, err := readFileFromDrive(svc, DatabasePath()) if err != nil { return err } - return os.WriteFile(dbFileName, data, 0666) + return os.WriteFile(DatabasePath(), data, 0666) } func SyncDatabaseToDrive() error { @@ -125,8 +132,8 @@ func SyncDatabaseToDrive() error { return err } - upstreamDBPath := fmt.Sprintf("%s/%s", dbFolderName, dbFileName) - return uploadFileToDrive(svc, upstreamDBPath, dbFileName) + dbPath := DatabasePath() + return uploadFileToDrive(svc, dbPath, dbPath) } func SyncDatabaseToDrivePeriodically(interval time.Duration) {