Add server name to serverUI

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index de6ec82b7f7ad2d5968fecde2b51173d9cd1e3b2..741c9a69e9d2b4b82821795911ea235d6b306623 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -15,15 +15,14 @@ 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
+       agreeModal  *tview.Modal
+       trackerList *tview.List
+       HLClient    *Client

 }
 
 // pages
 }
 
 // pages


@@ -40,7 +39,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.


@@ -127,10 +126,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")


@@ -206,21 +206,21 @@ func (ui *UI) joinServer(addr, login, password string) error {
                        if err != nil {
                                ui.HLClient.Logger.Errorw("read error", "err", err)
 
                        if err != nil {
                                ui.HLClient.Logger.Errorw("read error", "err", err)
 

-                               msg := err.Error()

                                if err == io.EOF {
                                if err == io.EOF {

-                                       msg = "The server connection has unexpectedly closed."
+                                       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")

 
 

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


@@ -258,11 +258,18 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
                        ui.Pages.SwitchToPage(backPage)
                }).
                AddButton("Connect", 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().


@@ -333,7 +340,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)