fix: no db error when db size is 0 (#629)

Fixes the error where File Browser would fail when the DB existed with size 0. This closes #628.

@1138-4EB I decided not to check the version for now since it's the first time we're adding that info. Only the next time we change the DB structure we'll use that value as reference to know how to upgrade.

I did not check it because the users running rc1 would have some issues with it.
pull/641/head
Henrique Dias 2019-01-09 21:37:47 +00:00 committed by GitHub
parent bafe9f0ad7
commit c1c57c6525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 13 deletions

View File

@ -62,29 +62,43 @@ type pythonData struct {
store *storage.Storage store *storage.Storage
} }
func dbExists(path string) (bool, error) {
stat, err := os.Stat(path)
if os.IsNotExist(err) {
return false, nil
} else if err != nil {
return false, err
}
if stat.Size() == 0 {
return false, nil
}
return true, nil
}
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) {
data := pythonData{hadDB: true} data := pythonData{hadDB: true}
path := getParam(cmd.Flags(), "database") path := getParam(cmd.Flags(), "database")
_, err := os.Stat(path) exists, err := dbExists(path)
if os.IsNotExist(err) { if err != nil {
data.hadDB = false panic(err)
} else if exists && cfg.noDB {
if !cfg.noDB && !cfg.allowNoDB { log.Fatal(path + " already exists")
} else if !exists && !cfg.noDB && !cfg.allowNoDB {
log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.") log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.")
} }
} else if err != nil {
panic(err)
} else if err == nil && cfg.noDB {
log.Fatal(path + " already exists")
}
data.hadDB = exists
db, err := storm.Open(path) db, err := storm.Open(path)
checkErr(err) checkErr(err)
defer db.Close() defer db.Close()
data.store = bolt.NewStorage(db) data.store, err = bolt.NewStorage(db)
checkErr(err)
fn(cmd, args, data) fn(cmd, args, data)
} }
} }

View File

@ -10,16 +10,21 @@ import (
) )
// NewStorage creates a storage.Storage based on Bolt DB. // NewStorage creates a storage.Storage based on Bolt DB.
func NewStorage(db *storm.DB) *storage.Storage { func NewStorage(db *storm.DB) (*storage.Storage, error) {
users := users.NewStorage(usersBackend{db: db}) users := users.NewStorage(usersBackend{db: db})
share := share.NewStorage(shareBackend{db: db}) share := share.NewStorage(shareBackend{db: db})
settings := settings.NewStorage(settingsBackend{db: db}) settings := settings.NewStorage(settingsBackend{db: db})
auth := auth.NewStorage(authBackend{db: db}, users) auth := auth.NewStorage(authBackend{db: db}, users)
err := save(db, "version", 2)
if err != nil {
return nil, err
}
return &storage.Storage{ return &storage.Storage{
Auth: auth, Auth: auth,
Users: users, Users: users,
Share: share, Share: share,
Settings: settings, Settings: settings,
} }, nil
} }

View File

@ -19,7 +19,10 @@ func Import(oldDB, oldConf, newDB string) error {
} }
defer new.Close() defer new.Close()
sto := bolt.NewStorage(new) sto, err := bolt.NewStorage(new)
if err != nil {
return err
}
err = importUsers(old, sto) err = importUsers(old, sto)
if err != nil { if err != nil {