Minor cleanup

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index b8c0430e34ac350f1584a36a6746c62f85ae3aa7..e4dafd597634c51a78494811a4ad59a0bc1244d7 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -22,10 +22,14 @@ type UI struct {
        userList     *tview.TextView
        agreeModal   *tview.Modal
        trackerList  *tview.List
-       settingsPage *tview.Box
        HLClient     *Client
 }
 
+// pages
+const (
+       pageServerUI = "serverUI"
+)
+
 func NewUI(c *Client) *UI {
        app := tview.NewApplication()
        chatBox := tview.NewTextView().
@@ -35,7 +39,7 @@ func NewUI(c *Client) *UI {
                SetChangedFunc(func() {
                        app.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
                })
-       chatBox.Box.SetBorder(true).SetTitle("Chat")
+       chatBox.Box.SetBorder(true).SetTitle("| Chat |")
 
        chatInput := tview.NewInputField()
        chatInput.
@@ -47,7 +51,7 @@ func NewUI(c *Client) *UI {
                                return
                        }
 
-                       c.Send(
+                       _ = c.Send(
                                *NewTransaction(tranChatSend, nil,
                                        NewField(fieldData, []byte(chatInput.GetText())),
                                ),
@@ -187,6 +191,10 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
 }
 
 func (ui *UI) joinServer(addr, login, password string) error {
+       // append default port to address if no port supplied
+       if len(strings.Split(addr, ":")) == 1 {
+               addr += ":5500"
+       }
        if err := ui.HLClient.JoinServer(addr, login, password); err != nil {
                return errors.New(fmt.Sprintf("Error joining server: %v\n", err))
        }
@@ -197,21 +205,21 @@ func (ui *UI) joinServer(addr, login, password string) error {
                        if err != nil {
                                ui.HLClient.Logger.Errorw("read error", "err", err)
 
-                               msg := err.Error()
                                if err == io.EOF {
-                                       msg = "The server connection has unexpectedly closed."
+                                       loginErrModal := tview.NewModal().
+                                               AddButtons([]string{"Ok"}).
+                                               SetText("The server connection has closed.").
+                                               SetDoneFunc(func(buttonIndex int, buttonLabel string) {
+                                                       ui.Pages.SwitchToPage("home")
+                                               })
+                                       loginErrModal.Box.SetTitle("Server Connection Error")
+
+                                       ui.Pages.AddPage("loginErr", loginErrModal, false, true)
+                                       ui.App.Draw()
+                                       return
                                }
+                               ui.Pages.SwitchToPage("home")
 
-                               loginErrModal := tview.NewModal().
-                                       AddButtons([]string{"Ok"}).
-                                       SetText(msg).
-                                       SetDoneFunc(func(buttonIndex int, buttonLabel string) {
-                                               ui.Pages.SwitchToPage("home")
-                                       })
-                               loginErrModal.Box.SetTitle("Server Connection Error")
-
-                               ui.Pages.AddPage("loginErr", loginErrModal, false, true)
-                               ui.App.Draw()
                                return
                        }
                }
@@ -297,9 +305,10 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
 }
 
 func (ui *UI) renderServerUI() *tview.Flex {
+       ui.chatBox.SetText("") // clear any previously existing chatbox text
        commandList := tview.NewTextView().SetDynamicColors(true)
        commandList.
-               SetText("[yellow]^n[-::]: Read News   [yellow]^p[-::]: Post News\n[yellow]^l[-::]: View Logs\n").
+               SetText("[yellow]^n[-::]: Read News   [yellow]^p[-::]: Post News\n[yellow]^l[-::]: View Logs   [yellow]^f[-::]: View Files\n").
                SetBorder(true).
                SetTitle("| Keyboard Shortcuts| ")
 
@@ -310,7 +319,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
        modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
                if buttonIndex == 1 {
                        _ = ui.HLClient.Disconnect()
-                       ui.Pages.SwitchToPage("home")
+                       ui.Pages.RemovePage(pageServerUI)
                } else {
                        ui.Pages.HidePage("modal")
                }
@@ -347,13 +356,12 @@ func (ui *UI) renderServerUI() *tview.Flex {
                if event.Key() == tcell.KeyCtrlP {
 
                        newsFlex := tview.NewFlex()
-
+                       newsFlex.SetBorderPadding(0, 0, 1, 1)
                        newsPostTextArea := tview.NewTextView()
-                       newsPostTextArea.SetBackgroundColor(tcell.ColorDimGray)
+                       newsPostTextArea.SetBackgroundColor(tcell.ColorDarkSlateGrey)
                        newsPostTextArea.SetChangedFunc(func() {
                                ui.App.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
                        })
-                       //newsPostTextArea.SetBorderPadding(0, 0, 1, 1)
 
                        newsPostForm := tview.NewForm().
                                SetButtonsAlign(tview.AlignRight).
@@ -361,10 +369,15 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                AddButton("Send", nil)
                        newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                                switch event.Key() {
+                               case tcell.KeyEscape:
+                                       ui.Pages.RemovePage("newsInput")
                                case tcell.KeyTab:
                                        ui.App.SetFocus(newsPostTextArea)
                                case tcell.KeyEnter:
                                        newsText := strings.ReplaceAll(newsPostTextArea.GetText(true), "\n", "\r")
+                                       if len(newsText) == 0 {
+                                               return event
+                                       }
                                        err := ui.HLClient.Send(
                                                *NewTransaction(tranOldPostNews, nil,
                                                        NewField(fieldData, []byte(newsText)),
@@ -386,14 +399,13 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                SetTitle("| Post Message |")
 
                        newsPostTextArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-                               ui.HLClient.Logger.Infow("key", "key", event.Key(), "rune", event.Rune())
                                switch event.Key() {
                                case tcell.KeyEscape:
                                        ui.Pages.RemovePage("newsInput")
                                case tcell.KeyTab:
                                        ui.App.SetFocus(newsPostForm)
                                case tcell.KeyEnter:
-                                       fmt.Fprintf(newsPostTextArea, "\n")
+                                       _, _ = fmt.Fprintf(newsPostTextArea, "\n")
                                default:
                                        const windowsBackspaceRune = 8
                                        const macBackspaceRune = 127
@@ -405,7 +417,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                                        newsPostTextArea.SetText(curTxt)
                                                }
                                        default:
-                                               fmt.Fprintf(newsPostTextArea, string(event.Rune()))
+                                               _, _ = fmt.Fprintf(newsPostTextArea, string(event.Rune()))
                                        }
                                }