Cleanup unneeded code

[rbdr/mobius] / client.go

diff --git a/client.go b/client.go
index de2844313e2d3b10d81d5b91a0d6046e706eb29c..0c8cdb025ec90f2c7b589f5ba55deb76a8c02e3d 100644 (file)
--- a/client.go
+++ b/client.go
@@ -210,7 +210,7 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
        iconStr := strconv.Itoa(ui.HLClient.pref.IconID)
        settingsForm := tview.NewForm()
        settingsForm.AddInputField("Your Name", ui.HLClient.pref.Username, 0, nil, nil)
-       settingsForm.AddInputField("IconID",iconStr, 0, func(idStr string, _ rune) bool {
+       settingsForm.AddInputField("IconID", iconStr, 0, func(idStr string, _ rune) bool {
                _, err := strconv.Atoi(idStr)
                return err == nil
        }, nil)
@@ -249,12 +249,6 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
        return centerFlex
 }
 
-var (
-       srvIP    string
-       srvLogin string
-       srvPass  string
-)
-
 // DebugBuffer wraps a *tview.TextView and adds a Sync() method to make it available as a Zap logger
 type DebugBuffer struct {
        TextView *tview.TextView
@@ -284,19 +278,13 @@ func (ui *UI) joinServer(addr, login, password string) error {
 }
 
 func (ui *UI) renderJoinServerForm(server, login, password, backPage string, save, defaultConnect bool) *tview.Flex {
-       srvIP = server
        joinServerForm := tview.NewForm()
        joinServerForm.
-               AddInputField("Server", server, 20, nil, func(text string) {
-                       srvIP = text
-               }).
-               AddInputField("Login", login, 20, nil, func(text string) {
-                       l := []byte(text)
-                       ui.HLClient.Login = &l
-               }).
-               AddPasswordField("Password", password, 20, '*', nil).
+               AddInputField("Server", server, 0, nil, nil).
+               AddInputField("Login", login, 0, nil, nil).
+               AddPasswordField("Password", password, 0, '*', nil).
                AddCheckbox("Save", save, func(checked bool) {
-                       // TODO
+                       // TODO: Implement bookmark saving
                }).
                AddButton("Cancel", func() {
                        ui.Pages.SwitchToPage(backPage)
@@ -435,8 +423,6 @@ func (ui *UI) Start() {
                        ui.Pages.AddAndSwitchToPage("trackerList", ui.trackerList, true)
                }).
                AddItem("Settings", "", 's', func() {
-                       //ui.Pages.AddPage("settings", ui.renderSettingsForm(), true, false)
-
                        ui.Pages.AddPage("settings", ui.renderSettingsForm(), true, true)
                }).
                AddItem("Quit", "", 'q', func() {
@@ -454,12 +440,10 @@ func (ui *UI) Start() {
                }
                // Show Logs
                if event.Key() == tcell.KeyCtrlL {
-                       //curPage, _ := ui.Pages.GetFrontPage()
                        ui.HLClient.DebugBuf.TextView.ScrollToEnd()
                        ui.HLClient.DebugBuf.TextView.SetBorder(true).SetTitle("Logs")
                        ui.HLClient.DebugBuf.TextView.SetDoneFunc(func(key tcell.Key) {
                                if key == tcell.KeyEscape {
-                                       //ui.Pages.SwitchToPage("serverUI")
                                        ui.Pages.RemovePage("logs")
                                }
                        })
@@ -470,7 +454,8 @@ func (ui *UI) Start() {
        })
 
        if err := ui.App.SetRoot(ui.Pages, true).SetFocus(ui.Pages).Run(); err != nil {
-               panic(err)
+               ui.App.Stop()
+               os.Exit(1)
        }
 }