Remove unused import and fix directory creation bug

funnyzak · Feb 21, 2024 · 8a07833 · 8a07833
1 parent 34f8bb4
commit 8a07833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/utils/file/file.go b/pkg/utils/file/file.go
@@ -5,7 +5,6 @@ import (
 	"encoding/hex"
 	"io"
 	"os"
-	"path"
 	"path/filepath"
 )
 
@@ -44,10 +43,9 @@ func FileMD5(filePath string) (string, error) {
 }
 
 func MkdirAllIfNotExists(pathname string, perm os.FileMode) error {
-	dir := path.Dir(pathname)
-	if _, err := os.Stat(dir); err != nil {
+	if _, err := os.Stat(pathname); err != nil {
 		if os.IsNotExist(err) {
-			if err := os.MkdirAll(dir, perm); err != nil {
+			if err := os.MkdirAll(pathname, perm); err != nil {
 				return err
 			}
 		}

diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go
@@ -3,6 +3,7 @@ package singleton
 import (
 	"fmt"
 	"os"
+	"path"
 	"time"
 
 	_ "github.com/ncruces/go-sqlite3/embed"
@@ -73,12 +74,12 @@ func InitLog(conf *gconfig.Config) {
 }
 
 // InitDBFromPath initialize the database from the given path
-func InitDBFromPath(path string) {
+func InitDBFromPath(dbpath string) {
 	var err error
-	if err = file.MkdirAllIfNotExists(path, os.ModePerm); err != nil {
+	if err = file.MkdirAllIfNotExists(path.Dir(dbpath), os.ModePerm); err != nil {
 		panic(err)
 	}
-	DB, err = gorm.Open(gormlite.Open(path), &gorm.Config{
+	DB, err = gorm.Open(gormlite.Open(dbpath), &gorm.Config{
 		CreateBatchSize: 200,
 	})
 	if err != nil {