1 files changed, 40 insertions, 17 deletions

diff --git a/src/page_config.go b/src/page_config.go
index bb8afca..090a70b 100644
--- a/src/page_config.go
+++ b/src/page_config.go
@@ -1,6 +1,7 @@
 package src
 
 import (
+        "fmt"
         "net/http"
 
         "github.com/delucks/go-subsonic"
@@ -8,20 +9,14 @@ import (
 )
 
 func configPage(a *app) *tview.Form {
+        var err error
+
         form := tview.NewForm().
                 AddInputField("Server URL", a.cfg.BaseURL, 40, nil, func(txt string) { a.cfg.BaseURL = txt }).
                 AddInputField("Username", a.cfg.Username, 20, nil, func(txt string) { a.cfg.Username = txt }).
                 AddPasswordField("Password", a.cfg.Password, 20, '*', func(txt string) { a.cfg.Password = txt }).
                 AddButton("Test", func() {
-                        tmpSub := &subsonic.Client{
-                                Client:       http.DefaultClient,
-                                BaseUrl:      a.cfg.BaseURL,
-                                User:         a.cfg.Username,
-                                ClientName:   "termsonic",
-                                PasswordAuth: true,
-                        }
-
-                        if err := tmpSub.Authenticate(a.cfg.Password); err != nil {
+                        if err = testConfig(a.cfg); err != nil {
                                 alert(a, "Could not auth: %v", err)
                         } else {
                                 alert(a, "Success.")
@@ -34,14 +29,8 @@ func configPage(a *app) *tview.Form {
                                 return
                         }
 
-                        a.sub = &subsonic.Client{
-                                Client:       http.DefaultClient,
-                                BaseUrl:      a.cfg.BaseURL,
-                                User:         a.cfg.Username,
-                                ClientName:   "termsonic",
-                                PasswordAuth: true,
-                        }
-                        if err := a.sub.Authenticate(a.cfg.Password); err != nil {
+                        a.sub, err = buildSubsonicClient(a.cfg)
+                        if err != nil {
                                 alert(a, "Could not auth: %v", err)
                         } else {
                                 alert(a, "All good!")
@@ -49,3 +38,37 @@ func configPage(a *app) *tview.Form {
                 })
         return form
 }
+
+func testConfig(cfg *Config) error {
+        if cfg.BaseURL == "" {
+                return fmt.Errorf("empty base URL")
+        }
+
+        if cfg.Username == "" {
+                return fmt.Errorf("empty username")
+        }
+
+        if cfg.Password == "" {
+                return fmt.Errorf("empty password")
+        }
+
+        _, err := buildSubsonicClient(cfg)
+        return err
+}
+
+func buildSubsonicClient(cfg *Config) (*subsonic.Client, error) {
+        tmpSub := &subsonic.Client{
+                Client:       http.DefaultClient,
+                BaseUrl:      cfg.BaseURL,
+                User:         cfg.Username,
+                ClientName:   "termsonic",
+                PasswordAuth: true,
+        }
+
+        err := tmpSub.Authenticate(cfg.Password)
+        if err != nil {
+                return nil, err
+        }
+
+        return tmpSub, nil
+}