X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/0da28a1fe47ffc60e40aeca9dddd7ab37e52a999..f3059b6aa517f9f8e204b2fa1913e2fdfccef570:/hotline/client.go

diff --git a/hotline/client.go b/hotline/client.go
index e5b396b..83bcfab 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -237,7 +237,41 @@ func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err erro
 	return res, err
 }
 
+func (c *Client) showErrMsg(msg string) {
+	time := time.Now().Format(time.RFC850)
+
+	title := "| Error |"
+
+	msgBox := tview.NewTextView().SetScrollable(true)
+	msgBox.SetText(msg).SetBackgroundColor(tcell.ColorDarkRed)
+	msgBox.SetTitle(title).SetBorder(true)
+	msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+		switch event.Key() {
+		case tcell.KeyEscape:
+			c.UI.Pages.RemovePage("serverMsgModal" + time)
+		}
+		return event
+	})
+
+	centeredFlex := tview.NewFlex().
+		AddItem(nil, 0, 1, false).
+		AddItem(tview.NewFlex().SetDirection(tview.FlexRow).
+			AddItem(nil, 0, 1, false).
+			AddItem(msgBox, 0, 2, true).
+			AddItem(nil, 0, 1, false), 0, 2, true).
+		AddItem(nil, 0, 1, false)
+
+	c.UI.Pages.AddPage("serverMsgModal"+time, centeredFlex, true, true)
+	c.UI.App.Draw() // TODO: errModal doesn't render without this.  wtf?
+}
+
 func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err error) {
+	if t.IsError() {
+		c.showErrMsg(string(t.GetField(fieldError).Data))
+		c.Logger.Infof("Error: %s", t.GetField(fieldError).Data)
+		return res, err
+	}
+
 	fTree := tview.NewTreeView().SetTopLevel(1)
 	root := tview.NewTreeNode("Root")
 	fTree.SetRoot(root).SetCurrentNode(root)
@@ -397,54 +431,6 @@ func handleNotifyDeleteUser(c *Client, t *Transaction) (res []Transaction, err e
 	return res, err
 }
 
-const readBuffSize = 1024000 // 1KB - TODO: what should this be?
-
-func (c *Client) ReadLoop() error {
-	tranBuff := make([]byte, 0)
-	tReadlen := 0
-	// Infinite loop where take action on incoming client requests until the connection is closed
-	for {
-		buf := make([]byte, readBuffSize)
-		tranBuff = tranBuff[tReadlen:]
-
-		readLen, err := c.Connection.Read(buf)
-		if err != nil {
-			return err
-		}
-		tranBuff = append(tranBuff, buf[:readLen]...)
-
-		// We may have read multiple requests worth of bytes from Connection.Read.  readTransactions splits them
-		// into a slice of transactions
-		var transactions []Transaction
-		if transactions, tReadlen, err = readTransactions(tranBuff); err != nil {
-			c.Logger.Errorw("Error handling transaction", "err", err)
-		}
-
-		// iterate over all of the transactions that were parsed from the byte slice and handle them
-		for _, t := range transactions {
-			if err := c.HandleTransaction(&t); err != nil {
-				c.Logger.Errorw("Error handling transaction", "err", err)
-			}
-		}
-	}
-}
-
-func (c *Client) GetTransactions() error {
-	tranBuff := make([]byte, 0)
-	tReadlen := 0
-
-	buf := make([]byte, readBuffSize)
-	tranBuff = tranBuff[tReadlen:]
-
-	readLen, err := c.Connection.Read(buf)
-	if err != nil {
-		return err
-	}
-	tranBuff = append(tranBuff, buf[:readLen]...)
-
-	return nil
-}
-
 func handleClientGetUserNameList(c *Client, t *Transaction) (res []Transaction, err error) {
 	var users []User
 	for _, field := range t.Fields {