show: Reorganize config code

Call the config setup code from the main Run function. This allows config variables to be used for all functions. Signed-off-by: Prarit Bhargava <prarit@redhat.com>
zaquestion · Sep 6, 2020 · dbf3165 · dbf3165
1 parent 084623b
commit dbf3165
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 45 deletions.
diff --git a/cmd/issue_show.go b/cmd/issue_show.go
@@ -35,6 +35,27 @@ var issueShowCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
+		viper.Reset()
+		viper.AddConfigPath(".git/lab")
+		viper.SetConfigName("show_metadata")
+		viper.SetConfigType("toml")
+		// write data
+		if _, ok := viper.ReadInConfig().(viper.ConfigFileNotFoundError); ok {
+			if _, err := os.Stat(".git/lab"); os.IsNotExist(err) {
+				os.MkdirAll(".git/lab", os.ModePerm)
+			}
+			if err := viper.WriteConfigAs(metadatafile); err != nil {
+				log.Fatal(err)
+			}
+			if err := viper.ReadInConfig(); err != nil {
+				log.Fatal(err)
+			}
+		} else {
+			if err := viper.ReadInConfig(); err != nil {
+				log.Fatal(err)
+			}
+		}
+
 		noMarkdown, _ := cmd.Flags().GetBool("no-markdown")
 		if err != nil {
 			log.Fatal(err)
@@ -57,6 +78,7 @@ var issueShowCmd = &cobra.Command{
 
 			printDiscussions(discussions, since, int(issueNum))
 		}
+		viper.Reset()
 	},
 }
 
@@ -123,27 +145,6 @@ func printDiscussions(discussions []*gitlab.Discussion, since string, issueNum i
 	// default path for metadata config file
 	metadatafile := ".git/lab/show_metadata.toml"
 
-	viper.Reset()
-	viper.AddConfigPath(".git/lab")
-	viper.SetConfigName("show_metadata")
-	viper.SetConfigType("toml")
-	// write data
-	if _, ok := viper.ReadInConfig().(viper.ConfigFileNotFoundError); ok {
-		if _, err := os.Stat(".git/lab"); os.IsNotExist(err) {
-			os.MkdirAll(".git/lab", os.ModePerm)
-		}
-		if err := viper.WriteConfigAs(metadatafile); err != nil {
-			log.Fatal(err)
-		}
-		if err := viper.ReadInConfig(); err != nil {
-			log.Fatal(err)
-		}
-	} else {
-		if err := viper.ReadInConfig(); err != nil {
-			log.Fatal(err)
-		}
-	}
-
 	issueEntry := fmt.Sprintf("issue%d", issueNum)
 	// if specified on command line use that, o/w use config, o/w Now
 	var (

diff --git a/cmd/mr_show.go b/cmd/mr_show.go
@@ -24,6 +24,9 @@ var (
 	mrShowPatchReverse bool
 )
 
+// default path for metadata config file
+var metadatafile = ".git/lab/show_metadata.toml"
+
 var mrShowCmd = &cobra.Command{
 	Use:        "show [remote] <id>",
 	Aliases:    []string{"get"},
@@ -41,6 +44,27 @@ var mrShowCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
+		viper.Reset()
+		viper.AddConfigPath(".git/lab")
+		viper.SetConfigName("show_metadata")
+		viper.SetConfigType("toml")
+		// write data
+		if _, ok := viper.ReadInConfig().(viper.ConfigFileNotFoundError); ok {
+			if _, err := os.Stat(".git/lab"); os.IsNotExist(err) {
+				os.MkdirAll(".git/lab", os.ModePerm)
+			}
+			if err := viper.WriteConfigAs(metadatafile); err != nil {
+				log.Fatal(err)
+			}
+			if err := viper.ReadInConfig(); err != nil {
+				log.Fatal(err)
+			}
+		} else {
+			if err := viper.ReadInConfig(); err != nil {
+				log.Fatal(err)
+			}
+		}
+
 		noMarkdown, _ := cmd.Flags().GetBool("no-markdown")
 		if err != nil {
 			log.Fatal(err)
@@ -81,6 +105,7 @@ var mrShowCmd = &cobra.Command{
 
 			printMRDiscussions(discussions, since, int(mrNum))
 		}
+		viper.Reset()
 	},
 }
 
@@ -164,30 +189,6 @@ WebURL: %s
 func printMRDiscussions(discussions []*gitlab.Discussion, since string, mrNum int) {
 	NewAccessTime := time.Now().UTC()
 
-	// default path for metadata config file
-	metadatafile := ".git/lab/show_metadata.toml"
-
-	viper.Reset()
-	viper.AddConfigPath(".git/lab")
-	viper.SetConfigName("show_metadata")
-	viper.SetConfigType("toml")
-	// write data
-	if _, ok := viper.ReadInConfig().(viper.ConfigFileNotFoundError); ok {
-		if _, err := os.Stat(".git/lab"); os.IsNotExist(err) {
-			os.MkdirAll(".git/lab", os.ModePerm)
-		}
-		if err := viper.WriteConfigAs(metadatafile); err != nil {
-			log.Fatal(err)
-		}
-		if err := viper.ReadInConfig(); err != nil {
-			log.Fatal(err)
-		}
-	} else {
-		if err := viper.ReadInConfig(); err != nil {
-			log.Fatal(err)
-		}
-	}
-
 	mrEntry := fmt.Sprintf("mr%d", mrNum)
 	// if specified on command line use that, o/w use config, o/w Now
 	var (