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

diff --git a/hotline/ui.go b/hotline/ui.go
index 5f1670d..406c88f 100644
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -26,6 +26,11 @@ type UI struct {
 	HLClient     *Client
 }
 
+// pages
+const (
+	pageServerUI = "serverUI"
+)
+
 func NewUI(c *Client) *UI {
 	app := tview.NewApplication()
 	chatBox := tview.NewTextView().
@@ -47,7 +52,7 @@ func NewUI(c *Client) *UI {
 				return
 			}
 
-			c.Send(
+			_ = c.Send(
 				*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")
 
-			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)
 		})
@@ -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")
 
-			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")
@@ -187,6 +192,10 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
 }
 
 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))
 	}
@@ -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."
+					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
 			}
 		}
@@ -220,14 +231,30 @@ func (ui *UI) joinServer(addr, login, password string) error {
 	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.
+		//	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) {
+			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)
+			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)
@@ -281,9 +308,10 @@ func (ui *UI) renderJoinServerForm(server, login, password, backPage string, sav
 }
 
 func (ui *UI) renderServerUI() *tview.Flex {
+	ui.chatBox.SetText("") // clear any previously existing chatbox text
 	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).
 		SetTitle("| Keyboard Shortcuts| ")
 
@@ -294,7 +322,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 	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")
 		}
@@ -331,13 +359,12 @@ func (ui *UI) renderServerUI() *tview.Flex {
 		if event.Key() == tcell.KeyCtrlP {
 
 			newsFlex := tview.NewFlex()
-
+			newsFlex.SetBorderPadding(0, 0, 1, 1)
 			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.SetBorderPadding(0, 0, 1, 1)
 
 			newsPostForm := tview.NewForm().
 				SetButtonsAlign(tview.AlignRight).
@@ -345,10 +372,15 @@ func (ui *UI) renderServerUI() *tview.Flex {
 				AddButton("Send", nil)
 			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")
+					if len(newsText) == 0 {
+						return event
+					}
 					err := ui.HLClient.Send(
 						*NewTransaction(tranOldPostNews, nil,
 							NewField(fieldData, []byte(newsText)),
@@ -370,14 +402,13 @@ func (ui *UI) renderServerUI() *tview.Flex {
 				SetTitle("| Post Message |")
 
 			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:
-					fmt.Fprintf(newsPostTextArea, "\n")
+					_, _ = fmt.Fprintf(newsPostTextArea, "\n")
 				default:
 					const windowsBackspaceRune = 8
 					const macBackspaceRune = 127
@@ -389,7 +420,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 							newsPostTextArea.SetText(curTxt)
 						}
 					default:
-						fmt.Fprintf(newsPostTextArea, string(event.Rune()))
+						_, _ = fmt.Fprintf(newsPostTextArea, string(event.Rune()))
 					}
 				}
 
@@ -439,7 +470,7 @@ func (ui *UI) Start() {
 	)
 
 	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() {