Remove a use of the global viper struct

gcla · Jun 5, 2022 · 9c15935 · 9c15935
1 parent 0117c97
commit 9c15935
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/configs/profiles/profiles.go b/configs/profiles/profiles.go
@@ -162,6 +162,14 @@ func confStringSlice(v *viper.Viper, name string, def []string) []string {
 	return res
 }
 
+func WriteConfigAs(name string) error {
+	return writeConfigAs(vDefault, name)
+}
+
+func writeConfigAs(v *viper.Viper, name string) error {
+	return v.WriteConfigAs(name)
+}
+
 //======================================================================
 // Local Variables:
 // mode: Go

diff --git a/ui/logsui.go b/ui/logsui.go
@@ -19,7 +19,6 @@ import (
 	"github.com/gcla/termshark/v2/configs/profiles"
 	"github.com/gcla/termshark/v2/widgets/fileviewer"
 	log "github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 )
 
 //======================================================================
@@ -43,15 +42,14 @@ func openLogsUi(app gowid.IApp) {
 }
 
 func openConfigUi(app gowid.IApp) {
-	viper.SetConfigName("termshark") // no need to include file extension - looks for file called termshark.ini for example
 	tmp, err := ioutil.TempFile("", "termshark-*.toml")
 	if err != nil {
 		OpenError(fmt.Sprintf("Could not create temp file: %v", err), app)
 		return
 	}
 	tmp.Close()
 
-	err = viper.WriteConfigAs(tmp.Name())
+	err = profiles.WriteConfigAs(tmp.Name())
 	if err != nil {
 		OpenError(fmt.Sprintf("Could not run config viewer\n\n%v", err), app)
 	} else {