X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/e75ba43a4e6032b94bf3a3fedf9f557f2c4969e4..0fcfa5d54b166559c0ca31932a71a7eabb79c72c:/hotline/ui.go?ds=inline

diff --git a/hotline/ui.go b/hotline/ui.go
index de6ec82..b9e45dd 100644
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -1,12 +1,10 @@
 package hotline
 
 import (
-	"errors"
 	"fmt"
-	"github.com/davecgh/go-spew/spew"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"io"
 	"io/ioutil"
 	"os"
@@ -15,15 +13,13 @@ import (
 )
 
 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
@@ -40,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??
 		})
-	chatBox.Box.SetBorder(true).SetTitle("Chat")
+	chatBox.Box.SetBorder(true).SetTitle("| Chat |")
 
 	chatInput := tview.NewInputField()
 	chatInput.
@@ -77,7 +73,6 @@ func NewUI(c *Client) *UI {
 		chatInput:   chatInput,
 		userList:    userList,
 		trackerList: tview.NewList(),
-		agreeModal:  tview.NewModal(),
 		HLClient:    c,
 	}
 }
@@ -112,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()
@@ -127,10 +122,11 @@ func (ui *UI) getTrackerList() *tview.List {
 	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")
 
-			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")
@@ -197,7 +193,7 @@ 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() {
@@ -206,21 +202,21 @@ func (ui *UI) joinServer(addr, login, password string) error {
 			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("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
 			}
 		}
@@ -234,7 +230,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).
@@ -258,11 +254,18 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
 			ui.Pages.SwitchToPage(backPage)
 		}).
 		AddButton("Connect", func() {
+			srvAddr := joinServerForm.GetFormItem(0).(*tview.InputField).GetText()
+			loginInput := joinServerForm.GetFormItem(1).(*tview.InputField).GetText()
 			err := ui.joinServer(
-				joinServerForm.GetFormItem(0).(*tview.InputField).GetText(),
-				joinServerForm.GetFormItem(1).(*tview.InputField).GetText(),
+				srvAddr,
+				loginInput,
 				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().
@@ -333,7 +336,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)
-	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)
@@ -366,7 +369,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() {
@@ -434,7 +437,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)