Refactor and backfill tests for tracker listing

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index 5056954c6ebe170660110be76606a975fa0be16c..6eba01175121534c57808122518445d6d16ec7c1 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -1,13 +1,11 @@
 package hotline
 
 import (
 package hotline
 
 import (

-       "errors"
+       "bufio"

        "fmt"
        "fmt"

-       "github.com/davecgh/go-spew/spew"

        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"

-       "gopkg.in/yaml.v2"
-       "io"
+       "gopkg.in/yaml.v3"

        "io/ioutil"
        "os"
        "strconv"
        "io/ioutil"
        "os"
        "strconv"


@@ -15,17 +13,20 @@ import (
 )
 
 type UI struct {
 )
 
 type UI struct {

-       chatBox      *tview.TextView
-       chatInput    *tview.InputField
-       App          *tview.Application
-       Pages        *tview.Pages
-       userList     *tview.TextView
-       agreeModal   *tview.Modal
-       trackerList  *tview.List
-       settingsPage *tview.Box
-       HLClient     *Client
+       chatBox     *tview.TextView
+       chatInput   *tview.InputField
+       App         *tview.Application
+       Pages       *tview.Pages
+       userList    *tview.TextView
+       trackerList *tview.List
+       HLClient    *Client

 }
 
 }
 

+// pages
+const (
+       pageServerUI = "serverUI"
+)
+

 func NewUI(c *Client) *UI {
        app := tview.NewApplication()
        chatBox := tview.NewTextView().
 func NewUI(c *Client) *UI {
        app := tview.NewApplication()
        chatBox := tview.NewTextView().


@@ -35,7 +36,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.


@@ -47,7 +48,7 @@ func NewUI(c *Client) *UI {
                                return
                        }
 
                                return
                        }
 

-                       c.Send(
+                       _ = c.Send(

                                *NewTransaction(tranChatSend, nil,
                                        NewField(fieldData, []byte(chatInput.GetText())),
                                ),
                                *NewTransaction(tranChatSend, nil,
                                        NewField(fieldData, []byte(chatInput.GetText())),
                                ),


@@ -72,7 +73,6 @@ func NewUI(c *Client) *UI {
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),

-               agreeModal:  tview.NewModal(),

                HLClient:    c,
        }
 }
                HLClient:    c,
        }
 }


@@ -95,7 +95,7 @@ func (ui *UI) showBookmarks() *tview.List {
                list.AddItem(srv.Name, srv.Addr, rune(shortcut+i), func() {
                        ui.Pages.RemovePage("joinServer")
 
                list.AddItem(srv.Name, srv.Addr, rune(shortcut+i), func() {
                        ui.Pages.RemovePage("joinServer")
 

-                       newJS := ui.renderJoinServerForm(addr, login, pass, "bookmarks", true, true)
+                       newJS := ui.renderJoinServerForm("", addr, login, pass, "bookmarks", true, true)

 
                        ui.Pages.AddPage("joinServer", newJS, true, true)
                })
 
                        ui.Pages.AddPage("joinServer", newJS, true, true)
                })


@@ -107,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 {
 func (ui *UI) getTrackerList() *tview.List {
        listing, err := GetListing(ui.HLClient.pref.Tracker)
        if err != nil {

-               spew.Dump(err)
+               // TODO

        }
 
        list := tview.NewList()
        }
 
        list := tview.NewList()


@@ -122,10 +122,11 @@ func (ui *UI) getTrackerList() *tview.List {
        shortcut := 97 // rune for "a"
        for i, srv := range listing {
                addr := srv.Addr()
        shortcut := 97 // rune for "a"
        for i, srv := range listing {
                addr := srv.Addr()

+               srvName := srv.Name

                list.AddItem(string(srv.Name), string(srv.Description), rune(shortcut+i), func() {
                        ui.Pages.RemovePage("joinServer")
 
                list.AddItem(string(srv.Name), string(srv.Description), rune(shortcut+i), func() {
                        ui.Pages.RemovePage("joinServer")
 

-                       newJS := ui.renderJoinServerForm(addr, GuestAccount, "", trackerListPage, false, true)
+                       newJS := ui.renderJoinServerForm(string(srvName), addr, GuestAccount, "", trackerListPage, false, true)

 
                        ui.Pages.AddPage("joinServer", newJS, true, true)
                        ui.Pages.ShowPage("joinServer")
 
                        ui.Pages.AddPage("joinServer", newJS, true, true)
                        ui.Pages.ShowPage("joinServer")


@@ -187,57 +188,96 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
 }
 
 func (ui *UI) joinServer(addr, login, password string) error {
 }
 
 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 {
        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() {
        }
 
        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())
+
+                       t, _, err := ReadTransaction(buf)

                        if err != nil {
                        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(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
+                               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
 }
 
        }()
 
        return nil
 }
 

-func (ui *UI) renderJoinServerForm(server, login, password, backPage string, save, defaultConnect bool) *tview.Flex {
+func (ui *UI) renderJoinServerForm(name, server, login, password, backPage string, save, defaultConnect bool) *tview.Flex {

        joinServerForm := tview.NewForm()
        joinServerForm.
        joinServerForm := tview.NewForm()
        joinServerForm.

+               //      AddInputField("Name", server, 0, func(textToCheck string, lastChar rune) bool {
+               //      return false
+               // }, nil).

                AddInputField("Server", server, 0, nil, nil).
                AddInputField("Login", login, 0, nil, nil).
                AddPasswordField("Password", password, 0, '*', nil).
                AddCheckbox("Save", save, func(checked bool) {
                AddInputField("Server", server, 0, nil, nil).
                AddInputField("Login", login, 0, nil, nil).
                AddPasswordField("Password", password, 0, '*', nil).
                AddCheckbox("Save", save, func(checked bool) {

+                       ui.HLClient.Logger.Infow("saving bookmark")

                        // TODO: Implement bookmark saving
                        // 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)
+                       if err != nil {
+                               panic(err)
+                       }
+
+                       err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
+                       if err != nil {
+                               panic(err)
+                       }
+                       //              pref := ui.HLClient.pref

                }).
                AddButton("Cancel", func() {
                        ui.Pages.SwitchToPage(backPage)
                }).
                AddButton("Connect", func() {
                }).
                AddButton("Cancel", func() {
                        ui.Pages.SwitchToPage(backPage)
                }).
                AddButton("Connect", func() {

+                       srvAddr := joinServerForm.GetFormItem(0).(*tview.InputField).GetText()
+                       loginInput := joinServerForm.GetFormItem(1).(*tview.InputField).GetText()

                        err := ui.joinServer(
                        err := ui.joinServer(

-                               joinServerForm.GetFormItem(0).(*tview.InputField).GetText(),
-                               joinServerForm.GetFormItem(1).(*tview.InputField).GetText(),
+                               srvAddr,
+                               loginInput,

                                joinServerForm.GetFormItem(2).(*tview.InputField).GetText(),
                        )
                                joinServerForm.GetFormItem(2).(*tview.InputField).GetText(),
                        )

+                       if name == "" {
+                               name = fmt.Sprintf("%s@%s", loginInput, srvAddr)
+                       }
+                       ui.HLClient.serverName = name
+

                        if err != nil {
                                ui.HLClient.Logger.Errorw("login error", "err", err)
                                loginErrModal := tview.NewModal().
                        if err != nil {
                                ui.HLClient.Logger.Errorw("login error", "err", err)
                                loginErrModal := tview.NewModal().


@@ -281,9 +321,10 @@ func (ui *UI) renderJoinServerForm(server, login, password, backPage string, sav
 }
 
 func (ui *UI) renderServerUI() *tview.Flex {
 }
 
 func (ui *UI) renderServerUI() *tview.Flex {

+       ui.chatBox.SetText("") // clear any previously existing chatbox text

        commandList := tview.NewTextView().SetDynamicColors(true)
        commandList.
        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| ")
 
                SetBorder(true).
                SetTitle("| Keyboard Shortcuts| ")
 


@@ -294,6 +335,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
        modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
                if buttonIndex == 1 {
                        _ = ui.HLClient.Disconnect()
        modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
                if buttonIndex == 1 {
                        _ = ui.HLClient.Disconnect()

+                       ui.Pages.RemovePage(pageServerUI)

                        ui.Pages.SwitchToPage("home")
                } else {
                        ui.Pages.HidePage("modal")
                        ui.Pages.SwitchToPage("home")
                } else {
                        ui.Pages.HidePage("modal")


@@ -307,7 +349,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                        AddItem(ui.chatBox, 0, 8, false).
                        AddItem(ui.chatInput, 3, 0, true), 0, 1, true).
                AddItem(ui.userList, 25, 1, false)
                        AddItem(ui.chatBox, 0, 8, false).
                        AddItem(ui.chatInput, 3, 0, true), 0, 1, true).
                AddItem(ui.userList, 25, 1, false)

-       serverUI.SetBorder(true).SetTitle("| Mobius - Connected to " + "TODO" + " |").SetTitleAlign(tview.AlignLeft)
+       serverUI.SetBorder(true).SetTitle("| Mobius - Connected to " + ui.HLClient.serverName + " |").SetTitleAlign(tview.AlignLeft)

        serverUI.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyEscape {
                        ui.Pages.AddPage("modal", modal, false, true)
        serverUI.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyEscape {
                        ui.Pages.AddPage("modal", modal, false, true)


@@ -331,23 +373,28 @@ func (ui *UI) renderServerUI() *tview.Flex {
                if event.Key() == tcell.KeyCtrlP {
 
                        newsFlex := tview.NewFlex()
                if event.Key() == tcell.KeyCtrlP {
 
                        newsFlex := tview.NewFlex()

-
+                       newsFlex.SetBorderPadding(0, 0, 1, 1)

                        newsPostTextArea := tview.NewTextView()
                        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.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).
 
                        newsPostForm := tview.NewForm().
                                SetButtonsAlign(tview.AlignRight).

-                               AddButton("Post", nil)
+                               // AddButton("Cancel", nil). // TODO: implement cancel button behavior
+                               AddButton("Send", nil)

                        newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                                switch event.Key() {
                        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")
                                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)),
                                        err := ui.HLClient.Send(
                                                *NewTransaction(tranOldPostNews, nil,
                                                        NewField(fieldData, []byte(newsText)),


@@ -357,7 +404,6 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                                ui.HLClient.Logger.Errorw("Error posting news", "err", err)
                                                // TODO: display errModal to user
                                        }
                                                ui.HLClient.Logger.Errorw("Error posting news", "err", err)
                                                // TODO: display errModal to user
                                        }

-                                       //newsInput.SetText("") // clear the input field after chat send

                                        ui.Pages.RemovePage("newsInput")
                                }
 
                                        ui.Pages.RemovePage("newsInput")
                                }
 


@@ -367,17 +413,16 @@ func (ui *UI) renderServerUI() *tview.Flex {
                        newsFlex.
                                SetDirection(tview.FlexRow).
                                SetBorder(true).
                        newsFlex.
                                SetDirection(tview.FlexRow).
                                SetBorder(true).

-                               SetTitle("News Post")
+                               SetTitle("| Post Message |")

 
                        newsPostTextArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 
                        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:
                                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
                                default:
                                        const windowsBackspaceRune = 8
                                        const macBackspaceRune = 127


@@ -389,7 +434,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                                        newsPostTextArea.SetText(curTxt)
                                                }
                                        default:
                                                        newsPostTextArea.SetText(curTxt)
                                                }
                                        default:

-                                               fmt.Fprintf(newsPostTextArea, string(event.Rune()))
+                                               _, _ = fmt.Fprintf(newsPostTextArea, string(event.Rune()))

                                        }
                                }
 
                                        }
                                }
 


@@ -405,7 +450,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                        SetDirection(tview.FlexRow).
                                        AddItem(nil, 0, 1, false).
                                        AddItem(newsFlex, 15, 1, true).
                                        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)
 
                                        AddItem(nil, 0, 1, false), 40, 1, false).
                                AddItem(nil, 0, 1, false)
 


@@ -439,7 +484,7 @@ func (ui *UI) Start() {
        )
 
        mainMenu.AddItem("Join Server", "", 'j', func() {
        )
 
        mainMenu.AddItem("Join Server", "", 'j', func() {

-               joinServerPage := ui.renderJoinServerForm("", GuestAccount, "", "home", false, false)
+               joinServerPage := ui.renderJoinServerForm("", "", GuestAccount, "", "home", false, false)

                ui.Pages.AddPage("joinServer", joinServerPage, true, true)
        }).
                AddItem("Bookmarks", "", 'b', func() {
                ui.Pages.AddPage("joinServer", joinServerPage, true, true)
        }).
                AddItem("Bookmarks", "", 'b', func() {