Add per-OS default config path to accomodate Windows

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index 9bb33e1d557c79c9195b58223cf0be4ec15071f3..35ec7fb488015c2c4ae00179cfea4468d8d53193 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -22,7 +22,6 @@ import (
        "time"
 )
 
        "time"
 )
 

-const clientConfigPath = "/usr/local/etc/mobius-client-config.yaml"

 const (
        trackerListPage = "trackerList"
 )
 const (
        trackerListPage = "trackerList"
 )


@@ -66,6 +65,7 @@ func readConfig(cfgPath string) (*ClientPrefs, error) {
 }
 
 type Client struct {
 }
 
 type Client struct {

+       cfgPath     string

        DebugBuf    *DebugBuffer
        Connection  net.Conn
        Login       *[]byte
        DebugBuf    *DebugBuffer
        Connection  net.Conn
        Login       *[]byte


@@ -234,7 +234,11 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
                        // TODO: handle err
                }
                // TODO: handle err
                        // TODO: handle err
                }
                // TODO: handle err

-               _ = ioutil.WriteFile(clientConfigPath, out, 0666)
+               err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
+               if err != nil {
+                       println(ui.HLClient.cfgPath)
+                       panic(err)
+               }

                ui.Pages.RemovePage("settings")
        })
        settingsForm.SetBorder(true)
                ui.Pages.RemovePage("settings")
        })
        settingsForm.SetBorder(true)


@@ -348,8 +352,8 @@ func (ui *UI) renderJoinServerForm(server, login, password, backPage string, sav
 func randomBanner() string {
        rand.Seed(time.Now().UnixNano())
 
 func randomBanner() string {
        rand.Seed(time.Now().UnixNano())
 

-       bannerFiles, _ := bannerDir.ReadDir("client/banners")
-       file, _ := bannerDir.ReadFile("client/banners/" + bannerFiles[rand.Intn(len(bannerFiles))].Name())
+       bannerFiles, _ := bannerDir.ReadDir("banners")
+       file, _ := bannerDir.ReadFile("banners/" + bannerFiles[rand.Intn(len(bannerFiles))].Name())

 
        return fmt.Sprintf("\n\n\nWelcome to...\n\n[red::b]%s[-:-:-]\n\n", file)
 }
 
        return fmt.Sprintf("\n\n\nWelcome to...\n\n[red::b]%s[-:-:-]\n\n", file)
 }


@@ -551,17 +555,19 @@ func (ui *UI) Start() {
        }
 }
 
        }
 }
 

-func NewClient(username string, logger *zap.SugaredLogger) *Client {
+func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client {

        c := &Client{
        c := &Client{

+               cfgPath:     cfgPath,

                Logger:      logger,
                activeTasks: make(map[uint32]*Transaction),
                Handlers:    clientHandlers,
        }
        c.UI = NewUI(c)
 
                Logger:      logger,
                activeTasks: make(map[uint32]*Transaction),
                Handlers:    clientHandlers,
        }
        c.UI = NewUI(c)
 

-       prefs, err := readConfig(clientConfigPath)
+       prefs, err := readConfig(cfgPath)

        if err != nil {
        if err != nil {

-               return c
+               fmt.Printf("unable to read config file")
+               logger.Fatal("unable to read config file", "path", cfgPath)

        }
        c.pref = prefs
 
        }
        c.pref = prefs