Make keepalive interval a const

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index 3d0fa68a941c138b3d0b9f91ec0e4434e1ac22af..c005fb438001969d03e3fdbc7c629daa07152ec5 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -2,11 +2,9 @@ package hotline
 
 import (
        "fmt"
-       "github.com/davecgh/go-spew/spew"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
-       "gopkg.in/yaml.v2"
-       "io"
+       "gopkg.in/yaml.v3"
        "io/ioutil"
        "os"
        "strconv"
@@ -19,7 +17,6 @@ type UI struct {
        App         *tview.Application
        Pages       *tview.Pages
        userList    *tview.TextView
-       agreeModal  *tview.Modal
        trackerList *tview.List
        HLClient    *Client
 }
@@ -51,8 +48,8 @@ func NewUI(c *Client) *UI {
                        }
 
                        _ = c.Send(
-                               *NewTransaction(tranChatSend, nil,
-                                       NewField(fieldData, []byte(chatInput.GetText())),
+                               *NewTransaction(TranChatSend, nil,
+                                       NewField(FieldData, []byte(chatInput.GetText())),
                                ),
                        )
                        chatInput.SetText("") // clear the input field after chat send
@@ -75,7 +72,6 @@ func NewUI(c *Client) *UI {
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),
-               agreeModal:  tview.NewModal(),
                HLClient:    c,
        }
 }
@@ -91,7 +87,7 @@ func (ui *UI) showBookmarks() *tview.List {
        list.Box.SetBorder(true).SetTitle("| Bookmarks |")
 
        shortcut := 97 // rune for "a"
-       for i, srv := range ui.HLClient.pref.Bookmarks {
+       for i, srv := range ui.HLClient.Pref.Bookmarks {
                addr := srv.Addr
                login := srv.Login
                pass := srv.Password
@@ -108,9 +104,9 @@ func (ui *UI) showBookmarks() *tview.List {
 }
 
 func (ui *UI) getTrackerList() *tview.List {
-       listing, err := GetListing(ui.HLClient.pref.Tracker)
+       listing, err := GetListing(ui.HLClient.Pref.Tracker)
        if err != nil {
-               spew.Dump(err)
+               // TODO
        }
 
        list := tview.NewList()
@@ -140,25 +136,27 @@ func (ui *UI) getTrackerList() *tview.List {
 }
 
 func (ui *UI) renderSettingsForm() *tview.Flex {
-       iconStr := strconv.Itoa(ui.HLClient.pref.IconID)
+       iconStr := strconv.Itoa(ui.HLClient.Pref.IconID)
        settingsForm := tview.NewForm()
-       settingsForm.AddInputField("Your Name", ui.HLClient.pref.Username, 0, nil, nil)
+       settingsForm.AddInputField("Your Name", ui.HLClient.Pref.Username, 0, nil, nil)
        settingsForm.AddInputField("IconID", iconStr, 0, func(idStr string, _ rune) bool {
                _, err := strconv.Atoi(idStr)
                return err == nil
        }, nil)
-       settingsForm.AddInputField("Tracker", ui.HLClient.pref.Tracker, 0, nil, nil)
+       settingsForm.AddInputField("Tracker", ui.HLClient.Pref.Tracker, 0, nil, nil)
+       settingsForm.AddCheckbox("Enable Terminal Bell", ui.HLClient.Pref.EnableBell, nil)
        settingsForm.AddButton("Save", func() {
                usernameInput := settingsForm.GetFormItem(0).(*tview.InputField).GetText()
                if len(usernameInput) == 0 {
                        usernameInput = "unnamed"
                }
-               ui.HLClient.pref.Username = usernameInput
+               ui.HLClient.Pref.Username = usernameInput
                iconStr = settingsForm.GetFormItem(1).(*tview.InputField).GetText()
-               ui.HLClient.pref.IconID, _ = strconv.Atoi(iconStr)
-               ui.HLClient.pref.Tracker = settingsForm.GetFormItem(2).(*tview.InputField).GetText()
+               ui.HLClient.Pref.IconID, _ = strconv.Atoi(iconStr)
+               ui.HLClient.Pref.Tracker = settingsForm.GetFormItem(2).(*tview.InputField).GetText()
+               ui.HLClient.Pref.EnableBell = settingsForm.GetFormItem(3).(*tview.Checkbox).IsChecked()
 
-               out, err := yaml.Marshal(&ui.HLClient.pref)
+               out, err := yaml.Marshal(&ui.HLClient.Pref)
                if err != nil {
                        // TODO: handle err
                }
@@ -195,34 +193,25 @@ func (ui *UI) joinServer(addr, login, password string) error {
        if len(strings.Split(addr, ":")) == 1 {
                addr += ":5500"
        }
-       if err := ui.HLClient.JoinServer(addr, login, password); err != nil {
+       if err := ui.HLClient.Connect(addr, login, password); err != nil {
                return fmt.Errorf("Error joining server: %v\n", err)
        }
 
        go func() {
-               for {
-                       err := ui.HLClient.ReadLoop()
-                       if err != nil {
-                               ui.HLClient.Logger.Errorw("read error", "err", err)
-
-                               if err == io.EOF {
-                                       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
-                               }
+               if err := ui.HLClient.HandleTransactions(); err != nil {
+                       ui.Pages.SwitchToPage("home")
+               }
+
+               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")
 
-                               return
-                       }
-               }
+               ui.Pages.AddPage("loginErr", loginErrModal, false, true)
+               ui.App.Draw()
        }()
 
        return nil
@@ -233,7 +222,7 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
        joinServerForm.
                //      AddInputField("Name", server, 0, func(textToCheck string, lastChar rune) bool {
                //      return false
-               //}, nil).
+               // }, nil).
                AddInputField("Server", server, 0, nil, nil).
                AddInputField("Login", login, 0, nil, nil).
                AddPasswordField("Password", password, 0, '*', nil).
@@ -241,8 +230,8 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
                        ui.HLClient.Logger.Infow("saving bookmark")
                        // TODO: Implement bookmark saving
 
-                       ui.HLClient.pref.AddBookmark(joinServerForm.GetFormItem(0).(*tview.InputField).GetText(), joinServerForm.GetFormItem(0).(*tview.InputField).GetText(), joinServerForm.GetFormItem(1).(*tview.InputField).GetText(), joinServerForm.GetFormItem(2).(*tview.InputField).GetText())
-                       out, err := yaml.Marshal(ui.HLClient.pref)
+                       ui.HLClient.Pref.AddBookmark(joinServerForm.GetFormItem(0).(*tview.InputField).GetText(), joinServerForm.GetFormItem(0).(*tview.InputField).GetText(), joinServerForm.GetFormItem(1).(*tview.InputField).GetText(), joinServerForm.GetFormItem(2).(*tview.InputField).GetText())
+                       out, err := yaml.Marshal(ui.HLClient.Pref)
                        if err != nil {
                                panic(err)
                        }
@@ -251,7 +240,7 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
                        if err != nil {
                                panic(err)
                        }
-                       //              pref := ui.HLClient.pref
+                       //              Pref := ui.HLClient.Pref
                }).
                AddButton("Cancel", func() {
                        ui.Pages.SwitchToPage(backPage)
@@ -327,6 +316,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                if buttonIndex == 1 {
                        _ = ui.HLClient.Disconnect()
                        ui.Pages.RemovePage(pageServerUI)
+                       ui.Pages.SwitchToPage("home")
                } else {
                        ui.Pages.HidePage("modal")
                }
@@ -347,14 +337,14 @@ func (ui *UI) renderServerUI() *tview.Flex {
 
                // List files
                if event.Key() == tcell.KeyCtrlF {
-                       if err := ui.HLClient.Send(*NewTransaction(tranGetFileNameList, nil)); err != nil {
+                       if err := ui.HLClient.Send(*NewTransaction(TranGetFileNameList, nil)); err != nil {
                                ui.HLClient.Logger.Errorw("err", "err", err)
                        }
                }
 
                // Show News
                if event.Key() == tcell.KeyCtrlN {
-                       if err := ui.HLClient.Send(*NewTransaction(tranGetMsgs, nil)); err != nil {
+                       if err := ui.HLClient.Send(*NewTransaction(TranGetMsgs, nil)); err != nil {
                                ui.HLClient.Logger.Errorw("err", "err", err)
                        }
                }
@@ -372,7 +362,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 
                        newsPostForm := tview.NewForm().
                                SetButtonsAlign(tview.AlignRight).
-                               //AddButton("Cancel", nil). // TODO: implement cancel button behavior
+                               // AddButton("Cancel", nil). // TODO: implement cancel button behavior
                                AddButton("Send", nil)
                        newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                                switch event.Key() {
@@ -386,8 +376,8 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                                return event
                                        }
                                        err := ui.HLClient.Send(
-                                               *NewTransaction(tranOldPostNews, nil,
-                                                       NewField(fieldData, []byte(newsText)),
+                                               *NewTransaction(TranOldPostNews, nil,
+                                                       NewField(FieldData, []byte(newsText)),
                                                ),
                                        )
                                        if err != nil {
@@ -440,7 +430,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                        SetDirection(tview.FlexRow).
                                        AddItem(nil, 0, 1, false).
                                        AddItem(newsFlex, 15, 1, true).
-                                       //AddItem(newsPostForm, 3, 0, false).
+                                       // AddItem(newsPostForm, 3, 0, false).
                                        AddItem(nil, 0, 1, false), 40, 1, false).
                                AddItem(nil, 0, 1, false)