minor: v0.12.0

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index 3d0fa68a941c138b3d0b9f91ec0e4434e1ac22af..d9372d1937d0beb61ec000f93861cc291a7dd9c0 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -1,13 +1,11 @@
 package hotline
 
 import (
 package hotline
 
 import (

+       "context"

        "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"
-       "io/ioutil"
+       "gopkg.in/yaml.v3"

        "os"
        "strconv"
        "strings"
        "os"
        "strconv"
        "strings"


@@ -19,7 +17,6 @@ type UI struct {
        App         *tview.Application
        Pages       *tview.Pages
        userList    *tview.TextView
        App         *tview.Application
        Pages       *tview.Pages
        userList    *tview.TextView

-       agreeModal  *tview.Modal

        trackerList *tview.List
        HLClient    *Client
 }
        trackerList *tview.List
        HLClient    *Client
 }


@@ -51,8 +48,8 @@ func NewUI(c *Client) *UI {
                        }
 
                        _ = c.Send(
                        }
 
                        _ = 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
                                ),
                        )
                        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(),
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),

-               agreeModal:  tview.NewModal(),

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


@@ -91,7 +87,7 @@ func (ui *UI) showBookmarks() *tview.List {
        list.Box.SetBorder(true).SetTitle("| Bookmarks |")
 
        shortcut := 97 // rune for "a"
        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
                addr := srv.Addr
                login := srv.Login
                pass := srv.Password


@@ -107,12 +103,7 @@ func (ui *UI) showBookmarks() *tview.List {
        return list
 }
 
        return list
 }
 

-func (ui *UI) getTrackerList() *tview.List {
-       listing, err := GetListing(ui.HLClient.pref.Tracker)
-       if err != nil {
-               spew.Dump(err)
-       }
-
+func (ui *UI) getTrackerList(servers []ServerRecord) *tview.List {

        list := tview.NewList()
        list.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyEsc {
        list := tview.NewList()
        list.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyEsc {


@@ -122,14 +113,13 @@ func (ui *UI) getTrackerList() *tview.List {
        })
        list.Box.SetBorder(true).SetTitle("| Servers |")
 
        })
        list.Box.SetBorder(true).SetTitle("| Servers |")
 

-       shortcut := 97 // rune for "a"
-       for i, srv := range listing {
-               addr := srv.Addr()
-               srvName := srv.Name
+       const shortcut = 97 // rune for "a"
+       for i, _ := range servers {
+               srv := servers[i]

                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(string(srvName), addr, GuestAccount, "", trackerListPage, false, true)
+                       newJS := ui.renderJoinServerForm(string(srv.Name), srv.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")


@@ -140,30 +130,32 @@ func (ui *UI) getTrackerList() *tview.List {
 }
 
 func (ui *UI) renderSettingsForm() *tview.Flex {
 }
 
 func (ui *UI) renderSettingsForm() *tview.Flex {

-       iconStr := strconv.Itoa(ui.HLClient.pref.IconID)
+       iconStr := strconv.Itoa(ui.HLClient.Pref.IconID)

        settingsForm := tview.NewForm()
        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("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"
                }
        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()
                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
                }
                // TODO: handle err
                if err != nil {
                        // TODO: handle err
                }
                // TODO: handle err

-               err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
+               err = os.WriteFile(ui.HLClient.cfgPath, out, 0666)

                if err != nil {
                        println(ui.HLClient.cfgPath)
                        panic(err)
                if err != nil {
                        println(ui.HLClient.cfgPath)
                        panic(err)


@@ -195,34 +187,25 @@ func (ui *UI) joinServer(addr, login, password string) error {
        if len(strings.Split(addr, ":")) == 1 {
                addr += ":5500"
        }
        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() {
                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(context.TODO()); 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")
                                ui.Pages.SwitchToPage("home")

+                       })
+               loginErrModal.Box.SetTitle("Server Connection Error")

 
 

-                               return
-                       }
-               }
+               ui.Pages.AddPage("loginErr", loginErrModal, false, true)
+               ui.App.Draw()

        }()
 
        return nil
        }()
 
        return nil


@@ -231,27 +214,26 @@ func (ui *UI) joinServer(addr, login, password string) error {
 func (ui *UI) renderJoinServerForm(name, server, login, password, backPage string, save, defaultConnect bool) *tview.Flex {
        joinServerForm := tview.NewForm()
        joinServerForm.
 func (ui *UI) renderJoinServerForm(name, server, login, password, backPage string, save, defaultConnect bool) *tview.Flex {
        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
+                       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(),
+                       )

 
 

-                       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)
+                       out, err := yaml.Marshal(ui.HLClient.Pref)

                        if err != nil {
                                panic(err)
                        }
 
                        if err != nil {
                                panic(err)
                        }
 

-                       err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
+                       err = os.WriteFile(ui.HLClient.cfgPath, out, 0666)

                        if err != nil {
                                panic(err)
                        }
                        if err != nil {
                                panic(err)
                        }

-                       //              pref := ui.HLClient.pref

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


@@ -270,7 +252,7 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
                        ui.HLClient.serverName = name
 
                        if err != nil {
                        ui.HLClient.serverName = name
 
                        if err != nil {

-                               ui.HLClient.Logger.Errorw("login error", "err", err)
+                               ui.HLClient.Logger.Error("login error", "err", err)

                                loginErrModal := tview.NewModal().
                                        AddButtons([]string{"Oh no"}).
                                        SetText(err.Error()).
                                loginErrModal := tview.NewModal().
                                        AddButtons([]string{"Oh no"}).
                                        SetText(err.Error()).


@@ -327,6 +309,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                if buttonIndex == 1 {
                        _ = ui.HLClient.Disconnect()
                        ui.Pages.RemovePage(pageServerUI)
                if buttonIndex == 1 {
                        _ = ui.HLClient.Disconnect()
                        ui.Pages.RemovePage(pageServerUI)

+                       ui.Pages.SwitchToPage("home")

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


@@ -347,21 +330,20 @@ func (ui *UI) renderServerUI() *tview.Flex {
 
                // List files
                if event.Key() == tcell.KeyCtrlF {
 
                // List files
                if event.Key() == tcell.KeyCtrlF {

-                       if err := ui.HLClient.Send(*NewTransaction(tranGetFileNameList, nil)); err != nil {
-                               ui.HLClient.Logger.Errorw("err", "err", err)
+                       if err := ui.HLClient.Send(*NewTransaction(TranGetFileNameList, nil)); err != nil {
+                               ui.HLClient.Logger.Error("err", "err", err)

                        }
                }
 
                // Show News
                if event.Key() == tcell.KeyCtrlN {
                        }
                }
 
                // Show News
                if event.Key() == tcell.KeyCtrlN {

-                       if err := ui.HLClient.Send(*NewTransaction(tranGetMsgs, nil)); err != nil {
-                               ui.HLClient.Logger.Errorw("err", "err", err)
+                       if err := ui.HLClient.Send(*NewTransaction(TranGetMsgs, nil)); err != nil {
+                               ui.HLClient.Logger.Error("err", "err", err)

                        }
                }
 
                // Post news
                if event.Key() == tcell.KeyCtrlP {
                        }
                }
 
                // Post news
                if event.Key() == tcell.KeyCtrlP {

-

                        newsFlex := tview.NewFlex()
                        newsFlex.SetBorderPadding(0, 0, 1, 1)
                        newsPostTextArea := tview.NewTextView()
                        newsFlex := tview.NewFlex()
                        newsFlex.SetBorderPadding(0, 0, 1, 1)
                        newsPostTextArea := tview.NewTextView()


@@ -372,7 +354,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 
                        newsPostForm := tview.NewForm().
                                SetButtonsAlign(tview.AlignRight).
 
                        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() {
                                AddButton("Send", nil)
                        newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                                switch event.Key() {


@@ -386,12 +368,12 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                                return event
                                        }
                                        err := ui.HLClient.Send(
                                                return event
                                        }
                                        err := ui.HLClient.Send(

-                                               *NewTransaction(tranOldPostNews, nil,
-                                                       NewField(fieldData, []byte(newsText)),
+                                               *NewTransaction(TranOldPostNews, nil,
+                                                       NewField(FieldData, []byte(newsText)),

                                                ),
                                        )
                                        if err != nil {
                                                ),
                                        )
                                        if err != nil {

-                                               ui.HLClient.Logger.Errorw("Error posting news", "err", err)
+                                               ui.HLClient.Logger.Error("Error posting news", "err", err)

                                                // TODO: display errModal to user
                                        }
                                        ui.Pages.RemovePage("newsInput")
                                                // TODO: display errModal to user
                                        }
                                        ui.Pages.RemovePage("newsInput")


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

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

                                        }
                                }
 
                                        }
                                }
 


@@ -440,7 +422,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)
 


@@ -481,7 +463,20 @@ func (ui *UI) Start() {
                        ui.Pages.AddAndSwitchToPage("bookmarks", ui.showBookmarks(), true)
                }).
                AddItem("Browse Tracker", "", 't', func() {
                        ui.Pages.AddAndSwitchToPage("bookmarks", ui.showBookmarks(), true)
                }).
                AddItem("Browse Tracker", "", 't', func() {

-                       ui.trackerList = ui.getTrackerList()
+                       listing, err := GetListing(ui.HLClient.Pref.Tracker)
+                       if err != nil {
+                               errMsg := fmt.Sprintf("Error fetching tracker results:\n%v", err)
+                               errModal := tview.NewModal()
+                               errModal.SetText(errMsg)
+                               errModal.AddButtons([]string{"Cancel"})
+                               errModal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
+                                       ui.Pages.RemovePage("errModal")
+                               })
+                               ui.Pages.RemovePage("joinServer")
+                               ui.Pages.AddPage("errModal", errModal, false, true)
+                               return
+                       }
+                       ui.trackerList = ui.getTrackerList(listing)

                        ui.Pages.AddAndSwitchToPage("trackerList", ui.trackerList, true)
                }).
                AddItem("Settings", "", 's', func() {
                        ui.Pages.AddAndSwitchToPage("trackerList", ui.trackerList, true)
                }).
                AddItem("Settings", "", 's', func() {


@@ -496,7 +491,7 @@ func (ui *UI) Start() {
        // App level input capture
        ui.App.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyCtrlC {
        // App level input capture
        ui.App.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyCtrlC {

-                       ui.HLClient.Logger.Infow("Exiting")
+                       ui.HLClient.Logger.Info("Exiting")

                        ui.App.Stop()
                        os.Exit(0)
                }
                        ui.App.Stop()
                        os.Exit(0)
                }