From 33a269d2205502f946b1a9d23dcd1ceec19cb6d2 Mon Sep 17 00:00:00 2001
From: hexxa <hexxa@outlook.com>
Date: Wed, 9 Feb 2022 13:50:11 +0800
Subject: [PATCH] fix(config): use proper var name for arguments

---
 cmd/start/main.go                      |   6 +++---
 src/server/config_load.go              |  26 ++++++++++++-------------
 src/server/config_load_test.go         |  16 +++++++--------
 src/server/testdata/test_quickshare.db | Bin 524288 -> 524288 bytes
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/cmd/start/main.go b/cmd/start/main.go
index cfe292f..bb9595b 100644
--- a/cmd/start/main.go
+++ b/cmd/start/main.go
@@ -9,15 +9,15 @@ import (
 	serverPkg "github.com/ihexxa/quickshare/src/server"
 )
 
-var opts = &serverPkg.Opts{}
+var args = &serverPkg.Args{}
 
 func main() {
-	_, err := goflags.Parse(opts)
+	_, err := goflags.Parse(args)
 	if err != nil {
 		panic(err)
 	}
 
-	cfg, err := serverPkg.LoadCfg(opts)
+	cfg, err := serverPkg.LoadCfg(args)
 	if err != nil {
 		fmt.Printf("failed to load config: %s", err)
 		os.Exit(1)
diff --git a/src/server/config_load.go b/src/server/config_load.go
index 3d485e9..7b3640d 100644
--- a/src/server/config_load.go
+++ b/src/server/config_load.go
@@ -12,14 +12,14 @@ import (
 	"github.com/ihexxa/quickshare/src/kvstore/boltdbpvd"
 )
 
-type Opts struct {
+type Args struct {
 	Host    string   `short:"h" long:"host" description:"server hostname"`
 	Port    int      `short:"p" long:"port" description:"server port"`
 	DbPath  string   `short:"d" long:"db" description:"path of the quickshare.db"`
 	Configs []string `short:"c" long:"configs" description:"config path"`
 }
 
-func LoadCfg(opts *Opts) (*gocfg.Cfg, error) {
+func LoadCfg(args *Args) (*gocfg.Cfg, error) {
 	defaultCfg, err := DefaultConfig()
 	if err != nil {
 		return nil, err
@@ -30,14 +30,14 @@ func LoadCfg(opts *Opts) (*gocfg.Cfg, error) {
 		return nil, err
 	}
 
-	cfg, err = mergeConfigFiles(cfg, opts.Configs)
+	cfg, err = mergeConfigFiles(cfg, args.Configs)
 	if err != nil {
 		return nil, err
 	}
 
 	dbPath := cfg.GrabString("Db.DbPath")
-	if opts.DbPath != "" {
-		dbPath = opts.DbPath
+	if args.DbPath != "" {
+		dbPath = args.DbPath
 		_, err := os.Stat(dbPath)
 		if err == nil {
 			cfg, err = mergeDbConfig(cfg, dbPath)
@@ -50,7 +50,7 @@ func LoadCfg(opts *Opts) (*gocfg.Cfg, error) {
 		}
 	}
 
-	return mergeArgs(cfg, opts)
+	return mergeArgs(cfg, args)
 }
 
 func mergeDbConfig(cfg *gocfg.Cfg, dbPath string) (*gocfg.Cfg, error) {
@@ -94,15 +94,15 @@ func mergeConfigFiles(cfg *gocfg.Cfg, configPaths []string) (*gocfg.Cfg, error)
 	return cfg, nil
 }
 
-func mergeArgs(cfg *gocfg.Cfg, opts *Opts) (*gocfg.Cfg, error) {
-	if opts.Host != "" {
-		cfg.SetString("Server.Host", opts.Host)
+func mergeArgs(cfg *gocfg.Cfg, args *Args) (*gocfg.Cfg, error) {
+	if args.Host != "" {
+		cfg.SetString("Server.Host", args.Host)
 	}
-	if opts.Port != 0 {
-		cfg.SetInt("Server.Port", opts.Port)
+	if args.Port != 0 {
+		cfg.SetInt("Server.Port", args.Port)
 	}
-	if opts.DbPath != "" {
-		cfg.SetString("Db.DbPath", opts.DbPath)
+	if args.DbPath != "" {
+		cfg.SetString("Db.DbPath", args.DbPath)
 	}
 
 	return cfg, nil
diff --git a/src/server/config_load_test.go b/src/server/config_load_test.go
index 544447e..45ef1a2 100644
--- a/src/server/config_load_test.go
+++ b/src/server/config_load_test.go
@@ -12,30 +12,30 @@ import (
 )
 
 func TestLoadCfg(t *testing.T) {
-	argsList := []*Opts{
+	argsList := []*Args{
 		// default config
-		&Opts{
+		&Args{
 			Host:    "",
 			Port:    0,
 			DbPath:  "",
 			Configs: []string{},
 		},
 		// default config + config_1
-		&Opts{
+		&Args{
 			Host:    "",
 			Port:    0,
 			DbPath:  "",
 			Configs: []string{"testdata/config_1.yml"},
 		},
 		// default config + config_1 + config_4
-		&Opts{
+		&Args{
 			Host:    "",
 			Port:    0,
 			DbPath:  "",
 			Configs: []string{"testdata/config_1.yml", "testdata/config_4.yml"},
 		},
 		// config partial overwrite
-		&Opts{
+		&Args{
 			Host:   "",
 			Port:   0,
 			DbPath: "",
@@ -47,7 +47,7 @@ func TestLoadCfg(t *testing.T) {
 			},
 		},
 		// default config + config_1 + config_4 + db_partial + args(db)
-		&Opts{
+		&Args{
 			Host:   "",
 			Port:   0,
 			DbPath: "testdata/test_quickshare.db",
@@ -331,8 +331,8 @@ func TestLoadCfg(t *testing.T) {
 	}
 
 	testLoadCfg := func(t *testing.T) {
-		for i, opts := range argsList {
-			gotCfg, err := LoadCfg(opts)
+		for i, args := range argsList {
+			gotCfg, err := LoadCfg(args)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/src/server/testdata/test_quickshare.db b/src/server/testdata/test_quickshare.db
index cf8a0e6d0dfa2cdcb41a02f8238e60de74e5794c..58aaa2790058f11b49b96d9c2b4246afb3cf5298 100644
GIT binary patch
delta 81
zcmZo@P-tjSnBX8#$H2${0+ZW$`42q4;<w!}fN=x=BmoD3dZ<jc<h#xp&rbe@$TTUm
aDKNGvFtsT#w<)l+DX_LFuq{(ye*ggL4j6<0

delta 81
zcmZo@P-tjSnBX8#!NAA>0#~Kqs9Y*M)wA6&fN=x=BmoD3N~p}*wP)t9D%o!hk!ezB
aQ($aUU}{rfZc|`sQ($dVU|XiZ{r~_5A{ev)