Minor cleanup

diff --git a/hotline/client.go b/hotline/client.go
index d656db5eb73910c1962af7af6d854533e1955a4c..076cdbaa35a197c2d0deb5bd4d7faab5dfdc1e7e 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -21,6 +21,7 @@ import (
 
 const (
        trackerListPage = "trackerList"
 
 const (
        trackerListPage = "trackerList"

+       serverUIPage = "serverUI"

 )
 
 //go:embed banners/*.txt
 )
 
 //go:embed banners/*.txt


@@ -280,11 +281,9 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                root.AddChild(node)
        }
 
                root.AddChild(node)
        }
 

-       var fileList []FileNameWithInfo

        for _, f := range t.Fields {
                var fn FileNameWithInfo
                _, _ = fn.Read(f.Data)
        for _, f := range t.Fields {
                var fn FileNameWithInfo
                _, _ = fn.Read(f.Data)

-               fileList = append(fileList, fn)

 
                if bytes.Equal(fn.Type, []byte("fldr")) {
                        node := tview.NewTreeNode(fmt.Sprintf("[blue::]📁 %s[-:-:-]", fn.Name))
 
                if bytes.Equal(fn.Type, []byte("fldr")) {
                        node := tview.NewTreeNode(fmt.Sprintf("[blue::]📁 %s[-:-:-]", fn.Name))


@@ -322,7 +321,7 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
        newsTextView := tview.NewTextView().
                SetText(newsText).
                SetDoneFunc(func(key tcell.Key) {
        newsTextView := tview.NewTextView().
                SetText(newsText).
                SetDoneFunc(func(key tcell.Key) {

-                       c.UI.Pages.SwitchToPage("serverUI")
+                       c.UI.Pages.SwitchToPage(serverUIPage)

                        c.UI.App.SetFocus(c.UI.chatInput)
                })
        newsTextView.SetBorder(true).SetTitle("News")
                        c.UI.App.SetFocus(c.UI.chatInput)
                })
        newsTextView.SetBorder(true).SetTitle("News")


@@ -537,7 +536,7 @@ func handleClientTranLogin(c *Client, t *Transaction) (res []Transaction, err er
                c.Logger.Error(string(t.GetField(fieldError).Data))
                return nil, errors.New("login error: " + string(t.GetField(fieldError).Data))
        }
                c.Logger.Error(string(t.GetField(fieldError).Data))
                return nil, errors.New("login error: " + string(t.GetField(fieldError).Data))
        }

-       c.UI.Pages.AddAndSwitchToPage("serverUI", c.UI.renderServerUI(), true)
+       c.UI.Pages.AddAndSwitchToPage(serverUIPage, c.UI.renderServerUI(), true)

        c.UI.App.SetFocus(c.UI.chatInput)
 
        if err := c.Send(*NewTransaction(tranGetUserNameList, nil)); err != nil {
        c.UI.App.SetFocus(c.UI.chatInput)
 
        if err := c.Send(*NewTransaction(tranGetUserNameList, nil)); err != nil {

diff --git a/hotline/ui.go b/hotline/ui.go
index 406c88f7a258dadc0d6690a71a7c1256673fb9c7..e4dafd597634c51a78494811a4ad59a0bc1244d7 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -22,7 +22,6 @@ type UI struct {
        userList     *tview.TextView
        agreeModal   *tview.Modal
        trackerList  *tview.List
        userList     *tview.TextView
        agreeModal   *tview.Modal
        trackerList  *tview.List

-       settingsPage *tview.Box

        HLClient     *Client
 }
 
        HLClient     *Client
 }
 


@@ -40,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??
                })
                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.
 
        chatInput := tview.NewInputField()
        chatInput.


@@ -206,12 +205,10 @@ func (ui *UI) joinServer(addr, login, password string) error {
                        if err != nil {
                                ui.HLClient.Logger.Errorw("read error", "err", err)
 
                        if err != nil {
                                ui.HLClient.Logger.Errorw("read error", "err", err)
 

-                               msg := err.Error()

                                if err == io.EOF {
                                if err == io.EOF {

-                                       msg = "The server connection has unexpectedly closed."

                                        loginErrModal := tview.NewModal().
                                                AddButtons([]string{"Ok"}).
                                        loginErrModal := tview.NewModal().
                                                AddButtons([]string{"Ok"}).

-                                               SetText(msg).
+                                               SetText("The server connection has closed.").

                                                SetDoneFunc(func(buttonIndex int, buttonLabel string) {
                                                        ui.Pages.SwitchToPage("home")
                                                })
                                                SetDoneFunc(func(buttonIndex int, buttonLabel string) {
                                                        ui.Pages.SwitchToPage("home")
                                                })