Fix error message on logout

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index dc852677f51a89fdf5b08b006b37be1891ff6d57..406c88f7a258dadc0d6690a71a7c1256673fb9c7 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -26,6 +26,11 @@ type UI struct {
        HLClient     *Client
 }
 
        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().


@@ -47,7 +52,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())),
                                ),


@@ -95,7 +100,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)
                })


@@ -125,7 +130,7 @@ func (ui *UI) getTrackerList() *tview.List {
                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("", 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,6 +192,10 @@ 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 {
                return errors.New(fmt.Sprintf("Error joining server: %v\n", err))
        }
        if err := ui.HLClient.JoinServer(addr, login, password); err != nil {
                return errors.New(fmt.Sprintf("Error joining server: %v\n", err))
        }


@@ -200,18 +209,20 @@ func (ui *UI) joinServer(addr, login, password string) error {
                                msg := err.Error()
                                if err == io.EOF {
                                        msg = "The server connection has unexpectedly closed."
                                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

                                }
                                }

+                               ui.Pages.SwitchToPage("home")

 
 

-                               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
                        }
                }
                                return
                        }
                }


@@ -220,14 +231,30 @@ func (ui *UI) joinServer(addr, login, password string) error {
        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("Cancel", func() {
                        ui.Pages.SwitchToPage(backPage)


@@ -281,11 +308,12 @@ 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).
                SetBorder(true).

-               SetTitle("Keyboard Shortcuts")
+               SetTitle("| Keyboard Shortcuts| ")

 
        modal := tview.NewModal().
                SetText("Disconnect from the server?").
 
        modal := tview.NewModal().
                SetText("Disconnect from the server?").


@@ -294,7 +322,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.SwitchToPage("home")
+                       ui.Pages.RemovePage(pageServerUI)

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


@@ -313,6 +341,13 @@ func (ui *UI) renderServerUI() *tview.Flex {
                        ui.Pages.AddPage("modal", modal, false, true)
                }
 
                        ui.Pages.AddPage("modal", modal, false, true)
                }
 

+               // List files
+               if event.Key() == tcell.KeyCtrlF {
+                       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 {
                // Show News
                if event.Key() == tcell.KeyCtrlN {
                        if err := ui.HLClient.Send(*NewTransaction(tranGetMsgs, nil)); err != nil {


@@ -324,23 +359,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)),


@@ -350,7 +390,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")
                                }
 


@@ -360,17 +399,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


@@ -382,7 +420,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()))

                                        }
                                }
 
                                        }
                                }
 


@@ -432,7 +470,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() {