Doing some work

cmd/root.go

@@ -24,9 +24,9 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"strings"
 
-	"git.bullercodeworks.com/brian/expds/app"
+	"git.bullercodeworks.com/brian/expds/data"
+	"git.bullercodeworks.com/brian/expds/helpers"
 	gap "github.com/muesli/go-app-paths"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -39,11 +39,10 @@ var (
 	Name      = "expds"
 	cfgFile   string
 	ConfigDir = ""
-	program   cli.Program
 	rootCmd   = &cobra.Command{
 		Use:   "expds",
 		Short: "Utility to edit and view PDS",
-		RunE:  opRun,
+		RunE:  runUI,
 	}
 )
 
@@ -63,7 +62,6 @@ func init() {
 
 func initConfig() {
 	viper.SetEnvPrefix(data.EnvPrefix)
-	viper.AutomaticEnv()
 	var firstDir string
 	if cfgFile == "" {
 		scope := gap.NewScope(gap.User, Name)
@@ -82,14 +80,15 @@ func initConfig() {
 
 	viper.SetDefault(data.KeyConfigDir, firstDir)
 	viper.SetDefault(data.KeyDebug, false)
+	viper.SetDefault(data.KeyDataDir, helpers.Path(firstDir, "data"))
+	viper.SetDefault(data.KeyVimMode, false)
 	viper.SetConfigFile(cfgFile)
-	viper.BindEnv(data.KeyDebug)
+	viper.AutomaticEnv()
 
 	configName := fmt.Sprintf("%s.yaml", Name)
 	var createConfig bool
-	sep := string(os.PathSeparator)
-	ConfigDir = fmt.Sprintf("%s%s", firstDir, sep)
-	configPath := fmt.Sprintf("%s%s", ConfigDir, configName)
+	ConfigDir = fmt.Sprintf("%s%s", firstDir, helpers.Sep)
+	configPath := helpers.Path(ConfigDir, configName)
 	if err := viper.ReadInConfig(); err != nil {
 		createConfig = true
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
@@ -116,17 +115,14 @@ func initConfig() {
 		}
 	}
 
-	if viper.GetString(data.KeyUrl) == "" {
-		url := helpers.CliPromptUser("Server URL", true)
-		if !strings.HasSuffix(url, "/") {
-			url = fmt.Sprintf("%s/", url)
+	dDir := viper.GetString(data.KeyDataDir)
+	_, err := os.Stat(dDir)
+	if os.IsNotExist(err) {
+		fmt.Println("Creating Data Directory:", dDir)
+		err := os.Mkdir(dDir, 0o755)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
 		}
-		viper.Set(data.KeyUrl, url)
-		viper.WriteConfig()
 	}
 }
-
-func opRun(cmd *cobra.Command, args []string) error {
-	p := app.NewProgram()
-	return p.Run(args)
-}

cmd/ui.go

@@ -0,0 +1,50 @@
+/*
+Copyright © Brian Buller <brian@bullercodeworks.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+package cmd
+
+import (
+	"git.bullercodeworks.com/brian/expds/app"
+	"github.com/spf13/cobra"
+)
+
+// uiCmd represents the ui command
+var uiCmd = &cobra.Command{
+	Use:   "ui",
+	Short: "Run the expds UI",
+	RunE:  runUI,
+}
+
+func init() {
+	rootCmd.AddCommand(uiCmd)
+}
+
+func runUI(cmd *cobra.Command, args []string) error {
+	app := app.NewApp()
+	defer func() {
+		maybePanic := recover()
+		app.Cleanup()
+		if maybePanic != nil {
+			panic(maybePanic)
+		}
+	}()
+	return app.Run(args)
+}