Merge pull request #96 from jhalter/disconnect_ban_users_earlier_in_login_flow

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index 741c9a69e9d2b4b82821795911ea235d6b306623..8b0a8c5607759b198d7e94549b43eddf3ee9a0aa 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -1,13 +1,11 @@
 package hotline
 
 import (
-       "errors"
+       "bufio"
        "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"
@@ -20,7 +18,6 @@ type UI struct {
        App         *tview.Application
        Pages       *tview.Pages
        userList    *tview.TextView
-       agreeModal  *tview.Modal
        trackerList *tview.List
        HLClient    *Client
 }
@@ -76,7 +73,6 @@ func NewUI(c *Client) *UI {
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),
-               agreeModal:  tview.NewModal(),
                HLClient:    c,
        }
 }
@@ -111,7 +107,7 @@ func (ui *UI) showBookmarks() *tview.List {
 func (ui *UI) getTrackerList() *tview.List {
        listing, err := GetListing(ui.HLClient.pref.Tracker)
        if err != nil {
-               spew.Dump(err)
+               // TODO
        }
 
        list := tview.NewList()
@@ -149,6 +145,7 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
                return err == 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 {
@@ -158,6 +155,7 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
                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.EnableBell = settingsForm.GetFormItem(3).(*tview.Checkbox).IsChecked()
 
                out, err := yaml.Marshal(&ui.HLClient.pref)
                if err != nil {
@@ -197,33 +195,46 @@ func (ui *UI) joinServer(addr, login, password string) error {
                addr += ":5500"
        }
        if err := ui.HLClient.JoinServer(addr, login, password); err != nil {
-               return errors.New(fmt.Sprintf("Error joining server: %v\n", err))
+               return fmt.Errorf("Error joining server: %v\n", err)
        }
 
        go func() {
-               for {
-                       err := ui.HLClient.ReadLoop()
+               // Create a new scanner for parsing incoming bytes into transaction tokens
+               scanner := bufio.NewScanner(ui.HLClient.Connection)
+               scanner.Split(transactionScanner)
+
+               // Scan for new transactions and handle them as they come in.
+               for scanner.Scan() {
+                       // Make a new []byte slice and copy the scanner bytes to it.  This is critical to avoid a data race as the
+                       // scanner re-uses the buffer for subsequent scans.
+                       buf := make([]byte, len(scanner.Bytes()))
+                       copy(buf, scanner.Bytes())
+
+                       var t Transaction
+                       _, err := t.Write(buf)
                        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
-                               }
-                               ui.Pages.SwitchToPage("home")
-
-                               return
+                               break
+                       }
+                       if err := ui.HLClient.HandleTransaction(&t); err != nil {
+                               ui.HLClient.Logger.Errorw("Error handling transaction", "err", err)
                        }
                }
+
+               if scanner.Err() == nil {
+                       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")
+
        }()
 
        return nil
@@ -234,7 +245,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).
@@ -328,6 +339,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")
                }
@@ -373,7 +385,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() {
@@ -441,7 +453,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)