From 6bf7065daded73ba9c0d39fb90239df2831e6d19 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Tue, 8 Jan 2019 03:49:47 +0100
Subject: [PATCH] reduce lines of code in single function

---
 storage/bolt/importer/conf.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/storage/bolt/importer/conf.go b/storage/bolt/importer/conf.go
index 618a7766..e7eb4474 100644
--- a/storage/bolt/importer/conf.go
+++ b/storage/bolt/importer/conf.go
@@ -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{}
 	if path != "" {
 		ext := filepath.Ext(path)
 
 		fd, err := os.Open(path)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		defer fd.Close()
 
@@ -81,23 +81,32 @@ func importConf(db *storm.DB, path string, sto *storage.Storage) error {
 		case ".yaml", ".yml":
 			err = yaml.NewDecoder(fd).Decode(cfg)
 		default:
-			return errors.New("unsupported config extension " + ext)
+			return nil, errors.New("unsupported config extension " + ext)
 		}
 
 		if err != nil {
-			return err
+			return nil, err
 		}
 	} else {
 		cfg = defaults
 		path, err := filepath.Abs(".")
 		if err != nil {
-			return err
+			return nil, err
 		}
 		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{}
-	err := db.Get("config", "commands", &commands)
+	err = db.Get("config", "commands", &commands)
 	if err != nil {
 		return err
 	}