Minor cleanup

[rbdr/mobius] / client.go

diff --git a/client.go b/client.go
index 12a93559f8b51875ac9d1cb90e8ed118e97d542a..de2844313e2d3b10d81d5b91a0d6046e706eb29c 100644 (file)
--- a/client.go
+++ b/client.go
@@ -17,11 +17,15 @@ import (
        "math/rand"
        "net"
        "os"
+       "strconv"
        "strings"
        "time"
 )
 
 const clientConfigPath = "/usr/local/etc/mobius-client-config.yaml"
+const (
+       trackerListPage = "trackerList"
+)
 
 //go:embed client/banners/*.txt
 var bannerDir embed.FS
@@ -37,6 +41,7 @@ type ClientPrefs struct {
        Username  string     `yaml:"Username"`
        IconID    int        `yaml:"IconID"`
        Bookmarks []Bookmark `yaml:"Bookmarks"`
+       Tracker   string     `yaml:"Tracker"`
 }
 
 func readConfig(cfgPath string) (*ClientPrefs, error) {
@@ -96,7 +101,6 @@ func NewUI(c *Client) *UI {
        app := tview.NewApplication()
        chatBox := tview.NewTextView().
                SetScrollable(true).
-               SetText("").
                SetDynamicColors(true).
                SetWordWrap(true).
                SetChangedFunc(func() {
@@ -108,7 +112,6 @@ func NewUI(c *Client) *UI {
        chatInput.
                SetLabel("> ").
                SetFieldBackgroundColor(tcell.ColorDimGray).
-               //SetFieldTextColor(tcell.ColorWhite).
                SetDoneFunc(func(key tcell.Key) {
                        // skip send if user hit enter with no other text
                        if len(chatInput.GetText()) == 0 {
@@ -125,10 +128,12 @@ func NewUI(c *Client) *UI {
 
        chatInput.Box.SetBorder(true).SetTitle("Send")
 
-       userList := tview.NewTextView().SetDynamicColors(true)
-       userList.SetChangedFunc(func() {
-               app.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
-       })
+       userList := tview.
+               NewTextView().
+               SetDynamicColors(true).
+               SetChangedFunc(func() {
+                       app.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
+               })
        userList.Box.SetBorder(true).SetTitle("Users")
 
        return &UI{
@@ -143,12 +148,6 @@ func NewUI(c *Client) *UI {
        }
 }
 
-const defaultUsername = "unnamed"
-
-const (
-       trackerListPage = "trackerList"
-)
-
 func (ui *UI) showBookmarks() *tview.List {
        list := tview.NewList()
        list.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
@@ -177,7 +176,7 @@ func (ui *UI) showBookmarks() *tview.List {
 }
 
 func (ui *UI) getTrackerList() *tview.List {
-       listing, err := GetListing("hltracker.com:5498")
+       listing, err := GetListing(ui.HLClient.pref.Tracker)
        if err != nil {
                spew.Dump(err)
        }
@@ -208,10 +207,20 @@ func (ui *UI) getTrackerList() *tview.List {
 }
 
 func (ui *UI) renderSettingsForm() *tview.Flex {
+       iconStr := strconv.Itoa(ui.HLClient.pref.IconID)
        settingsForm := tview.NewForm()
-       settingsForm.AddInputField("Your Name", ui.HLClient.pref.Username, 20, 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.AddButton("Save", func() {
                ui.HLClient.pref.Username = settingsForm.GetFormItem(0).(*tview.InputField).GetText()
+               iconStr = settingsForm.GetFormItem(1).(*tview.InputField).GetText()
+               ui.HLClient.pref.IconID, _ = strconv.Atoi(iconStr)
+               ui.HLClient.pref.Tracker = settingsForm.GetFormItem(2).(*tview.InputField).GetText()
+
                out, err := yaml.Marshal(&ui.HLClient.pref)
                if err != nil {
                        // TODO: handle err
@@ -414,9 +423,8 @@ func (ui *UI) Start() {
                0, 1, true,
        )
 
-       joinServerPage := ui.renderJoinServerForm("", GuestAccount, "", "home", false, false)
-
        mainMenu.AddItem("Join Server", "", 'j', func() {
+               joinServerPage := ui.renderJoinServerForm("", GuestAccount, "", "home", false, false)
                ui.Pages.AddPage("joinServer", joinServerPage, true, true)
        }).
                AddItem("Bookmarks", "", 'b', func() {
@@ -853,61 +861,6 @@ func (c *Client) LogIn(login string, password string) error {
        )
 }
 
-//// Agree agrees to the server agreement and sends user info, completing the login sequence
-//func (c *Client) Agree() {
-//     c.Send(
-//             NewTransaction(
-//                     tranAgreed, 3,
-//                     []Field{
-//                             NewField(fieldUserName, []byte("test")),
-//                             NewField(fieldUserIconID, *c.Icon),
-//                             NewField(fieldUserFlags, []byte{0x00, 0x00}),
-//                     },
-//             ),
-//     )
-//     //
-//     //// Block until we receive the agreement reply from the server
-//     //_ = c.WaitForTransaction(tranAgreed)
-//}
-
-//func (c *Client) WaitForTransaction(id uint16) Transaction {
-//     var trans Transaction
-//     for {
-//             buf := make([]byte, 1400)
-//             readLen, err := c.Connection.Read(buf)
-//             if err != nil {
-//                     panic(err)
-//             }
-//
-//             transactions := ReadTransactions(buf[:readLen])
-//             tran, err := FindTransactions(id, transactions)
-//             if err == nil {
-//                     fmt.Println("returning")
-//                     return tran
-//             }
-//     }
-//
-//     return trans
-//}
-
-//func (c *Client) Read() error {
-//     // Main loop where we wait for and take action on client requests
-//     for {
-//             buf := make([]byte, 1400)
-//             readLen, err := c.Connection.Read(buf)
-//             if err != nil {
-//                     panic(err)
-//             }
-//             transactions, _, _ := readTransactions(buf[:readLen])
-//
-//             for _, t := range transactions {
-//                     c.HandleTransaction(&t)
-//             }
-//     }
-//
-//     return nil
-//}
-
 func (c *Client) Send(t Transaction) error {
        requestNum := binary.BigEndian.Uint16(t.Type)
        tID := binary.BigEndian.Uint32(t.ID)