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

reduce lines of code in single function

Browse Source
This commit is contained in:
1138-4EB 2019-01-08 03:49:47 +01:00
parent ca7f37a6fa
commit 8e6566617c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/bolt/importer/conf.go
View File

@ -62,14 +62,14 @@ var defaults = &oldConf{
}, },
} }
func importConf(db *storm.DB, path string, sto *storage.Storage) error { func readConf(path string) (*oldConf, error) {
cfg := &oldConf{} cfg := &oldConf{}
if path != "" { if path != "" {
ext := filepath.Ext(path) ext := filepath.Ext(path)
fd, err := os.Open(path) fd, err := os.Open(path)
if err != nil { if err != nil {
return err return nil, err
} }
defer fd.Close() defer fd.Close()
@ -81,23 +81,32 @@ func importConf(db *storm.DB, path string, sto *storage.Storage) error {
case ".yaml", ".yml": case ".yaml", ".yml":
err = yaml.NewDecoder(fd).Decode(cfg) err = yaml.NewDecoder(fd).Decode(cfg)
default: default:
return errors.New("unsupported config extension " + ext) return nil, errors.New("unsupported config extension " + ext)
} }
if err != nil { if err != nil {
return err return nil, err
} }
} else { } else {
cfg = defaults cfg = defaults
path, err := filepath.Abs(".") path, err := filepath.Abs(".")
if err != nil { if err != nil {
return err return nil, err
} }
cfg.Defaults.Scope = path cfg.Defaults.Scope = path
} }
return cfg, nil
}
func importConf(db *storm.DB, path string, sto *storage.Storage) error {
cfg, err := readConf(path)
if err != nil {
return err
}
commands := map[string][]string{} commands := map[string][]string{}
err := db.Get("config", "commands", &commands) err = db.Get("config", "commands", &commands)
if err != nil { if err != nil {
return err return err
} }