nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: defer db.Close

Browse Source
This commit is contained in:
face.wsl 2022-11-20 23:45:05 +08:00
parent 8cd5ecd077
commit 8c8be1cdf2
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/utils.go
View File

@ -83,7 +83,11 @@ func dbExists(path string) (bool, error) {
return false, err return false, err
} }
func openBoltDB(path string, cfg pythonConfig) pythonData { type Closeable interface {
Close() error
}
func openBoltDB(path string, cfg pythonConfig) (pythonData, Closeable) {
data := pythonData{hadDB: true} data := pythonData{hadDB: true}
exists, err := dbExists(path) exists, err := dbExists(path)
@ -98,17 +102,16 @@ func openBoltDB(path string, cfg pythonConfig) pythonData {
data.hadDB = exists data.hadDB = exists
db, err := storm.Open(path) db, err := storm.Open(path)
checkErr(err) checkErr(err)
defer db.Close()
data.store, err = bolt.NewStorage(db) data.store, err = bolt.NewStorage(db)
checkErr(err) checkErr(err)
return data return data, db
} }
func isPsqlDB(path string) bool { func isPsqlDB(path string) bool {
return strings.HasPrefix(path, "postgres:") return strings.HasPrefix(path, "postgres:")
} }
func openPsqlDB(path string, cfg pythonConfig) pythonData { func openPsqlDB(path string, cfg pythonConfig) (pythonData, Closeable) {
data := pythonData{hadDB: true} data := pythonData{hadDB: true}
db, err := psql.ConnectDB(path) db, err := psql.ConnectDB(path)
if err != nil { if err != nil {
@ -116,10 +119,10 @@ func openPsqlDB(path string, cfg pythonConfig) pythonData {
} else { } else {
log.Fatal("Fail to open psql database " + path) log.Fatal("Fail to open psql database " + path)
} }
return data return data, db
} }
func openDB(path string, cfg pythonConfig) pythonData { func openDB(path string, cfg pythonConfig) (pythonData, Closeable) {
if isPsqlDB(path) { if isPsqlDB(path) {
return openPsqlDB(path, cfg) return openPsqlDB(path, cfg)
} }
@ -128,8 +131,27 @@ func openDB(path string, cfg pythonConfig) pythonData {
func python(fn pythonFunc, cfg pythonConfig) cobraFunc { func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
return func(cmd *cobra.Command, args []string) { return func(cmd *cobra.Command, args []string) {
path := getParam(cmd.Flags(), "database") // data := pythonData{hadDB: true}
data := openDB(path, cfg)
// path := getParam(cmd.Flags(), "database")
// exists, err := dbExists(path)
// if err != nil {
// panic(err)
// } else if exists && cfg.noDB {
// log.Fatal(path + " already exists")
// } else if !exists && !cfg.noDB && !cfg.allowNoDB {
// log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.")
// }
// data.hadDB = exists
// db, err := storm.Open(path)
// checkErr(err)
// defer db.Close()
// data.store, err = bolt.NewStorage(db)
// checkErr(err)
data, db := openDB(getParam(cmd.Flags(), "database"), cfg)
defer db.Close()
fn(cmd, args, data) fn(cmd, args, data)
} }
} }