X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/e75ba43a4e6032b94bf3a3fedf9f557f2c4969e4..4e22add664e9de2b48876c5cae18a7c26458066a:/hotline/ui.go?ds=sidebyside

diff --git a/hotline/ui.go b/hotline/ui.go
index de6ec82..c005fb4 100644
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -1,13 +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"
-	"io"
+	"gopkg.in/yaml.v3"
 	"io/ioutil"
 	"os"
 	"strconv"
@@ -15,15 +12,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 +35,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.
@@ -53,8 +48,8 @@ func NewUI(c *Client) *UI {
 			}
 
 			_ = 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
@@ -77,7 +72,6 @@ func NewUI(c *Client) *UI {
 		chatInput:   chatInput,
 		userList:    userList,
 		trackerList: tview.NewList(),
-		agreeModal:  tview.NewModal(),
 		HLClient:    c,
 	}
 }
@@ -93,7 +87,7 @@ func (ui *UI) showBookmarks() *tview.List {
 	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
@@ -110,9 +104,9 @@ func (ui *UI) showBookmarks() *tview.List {
 }
 
 func (ui *UI) getTrackerList() *tview.List {
-	listing, err := GetListing(ui.HLClient.pref.Tracker)
+	listing, err := GetListing(ui.HLClient.Pref.Tracker)
 	if err != nil {
-		spew.Dump(err)
+		// TODO
 	}
 
 	list := tview.NewList()
@@ -127,10 +121,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")
@@ -141,25 +136,27 @@ func (ui *UI) getTrackerList() *tview.List {
 }
 
 func (ui *UI) renderSettingsForm() *tview.Flex {
-	iconStr := strconv.Itoa(ui.HLClient.pref.IconID)
+	iconStr := strconv.Itoa(ui.HLClient.Pref.IconID)
 	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("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"
 		}
-		ui.HLClient.pref.Username = usernameInput
+		ui.HLClient.Pref.Username = usernameInput
 		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
 		}
@@ -196,34 +193,25 @@ func (ui *UI) joinServer(addr, login, password string) error {
 	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.Connect(addr, login, password); err != nil {
+		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)
-
-				msg := err.Error()
-				if err == io.EOF {
-					msg = "The server connection has unexpectedly closed."
-				}
+		if err := ui.HLClient.HandleTransactions(); err != nil {
+			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")
+		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.AddPage("loginErr", loginErrModal, false, true)
+		ui.App.Draw()
 	}()
 
 	return nil
@@ -234,7 +222,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).
@@ -242,8 +230,8 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
 			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())
-			out, err := yaml.Marshal(ui.HLClient.pref)
+			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)
 			}
@@ -252,17 +240,24 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
 			if err != nil {
 				panic(err)
 			}
-			// 		pref := ui.HLClient.pref
+			// 		Pref := ui.HLClient.Pref
 		}).
 		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(
-				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().
@@ -321,6 +316,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 		if buttonIndex == 1 {
 			_ = ui.HLClient.Disconnect()
 			ui.Pages.RemovePage(pageServerUI)
+			ui.Pages.SwitchToPage("home")
 		} else {
 			ui.Pages.HidePage("modal")
 		}
@@ -333,7 +329,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)
@@ -341,14 +337,14 @@ func (ui *UI) renderServerUI() *tview.Flex {
 
 		// List files
 		if event.Key() == tcell.KeyCtrlF {
-			if err := ui.HLClient.Send(*NewTransaction(tranGetFileNameList, nil)); err != nil {
+			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 {
+			if err := ui.HLClient.Send(*NewTransaction(TranGetMsgs, nil)); err != nil {
 				ui.HLClient.Logger.Errorw("err", "err", err)
 			}
 		}
@@ -366,7 +362,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() {
@@ -380,8 +376,8 @@ func (ui *UI) renderServerUI() *tview.Flex {
 						return event
 					}
 					err := ui.HLClient.Send(
-						*NewTransaction(tranOldPostNews, nil,
-							NewField(fieldData, []byte(newsText)),
+						*NewTransaction(TranOldPostNews, nil,
+							NewField(FieldData, []byte(newsText)),
 						),
 					)
 					if err != nil {
@@ -434,7 +430,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)