chore: ⬆️ bump go-hass-anything version and adjust code for changes

joshuar · Feb 26, 2024 · f0bb567 · f0bb567
1 parent 9bef22b
commit f0bb567
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 48 deletions.
diff --git a/go.mod b/go.mod
@@ -51,7 +51,7 @@ require (
 	github.com/go-text/typesetting v0.1.0 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/joshuar/go-hass-anything/v5 v5.0.0
+	github.com/joshuar/go-hass-anything/v5 v5.0.1
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/klauspost/compress v1.17.5 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect

diff --git a/go.sum b/go.sum
@@ -253,6 +253,8 @@ github.com/jeandeaual/go-locale v0.0.0-20240204043739-672d8d016d9a/go.mod h1:ecP
 github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
 github.com/joshuar/go-hass-anything/v5 v5.0.0 h1:RYPqgoZXfM7EJ9r0MZ6e3pmGnw610JPkIEi5WX6rkkM=
 github.com/joshuar/go-hass-anything/v5 v5.0.0/go.mod h1:HBzVNZ8uhaRRP10g8mEJcX4zX4MC6UC/nugHUZlnmlQ=
+github.com/joshuar/go-hass-anything/v5 v5.0.1 h1:3C9WgM+XfNBlI9lGDiHTJ/sOAAp7sUwVSzsb2FjQmEE=
+github.com/joshuar/go-hass-anything/v5 v5.0.1/go.mod h1:HBzVNZ8uhaRRP10g8mEJcX4zX4MC6UC/nugHUZlnmlQ=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=

diff --git a/internal/agent/runners.go b/internal/agent/runners.go
@@ -176,11 +176,8 @@ func runMQTTWorker(ctx context.Context) {
 	if !prefs.MQTTEnabled {
 		return
 	}
-	mqttprefs := &preferences.MQTTPreferences{
-		Prefs: prefs,
-	}
 
-	c, err := mqttapi.NewMQTTClient(ctx, mqttprefs)
+	c, err := mqttapi.NewMQTTClient(ctx, prefs)
 	if err != nil {
 		log.Error().Err(err).Msg("Could not start MQTT client.")
 		return
@@ -220,11 +217,7 @@ func resetMQTTWorker(ctx context.Context) {
 	}
 
 	if prefs.MQTTRegistered {
-		mqttprefs := &preferences.MQTTPreferences{
-			Prefs: prefs,
-		}
-
-		c, err := mqttapi.NewMQTTClient(ctx, mqttprefs)
+		c, err := mqttapi.NewMQTTClient(ctx, prefs)
 		if err != nil {
 			log.Error().Err(err).Msg("Could not start MQTT client.")
 			return

diff --git a/internal/agent/ui/fyneUI/fyneUI.go b/internal/agent/ui/fyneUI/fyneUI.go
@@ -196,10 +196,10 @@ func (i *fyneUI) agentSettingsWindow() fyne.Window {
 
 	// MQTT settings
 	mqttPrefs := &ui.MQTTPreferences{
-		Enabled:  prefs.MQTTEnabled,
-		Server:   prefs.MQTTServer,
-		User:     prefs.MQTTUser,
-		Password: prefs.MQTTPassword,
+		Enabled:  prefs.GetMQTTEnabled(),
+		Server:   prefs.GetMQTTServer(),
+		User:     prefs.GetMQTTUser(),
+		Password: prefs.GetMQTTPassword(),
 	}
 	allFormItems = append(allFormItems, i.mqttConfigItems(mqttPrefs)...)
 

diff --git a/internal/preferences/mqtt.go b/internal/preferences/mqtt.go
diff --git a/internal/preferences/prefs.go b/internal/preferences/prefs.go
@@ -196,6 +196,27 @@ func SetMQTTRegistered(status bool) Preference {
 	}
 }
 
+func (p *Preferences) GetMQTTEnabled() bool {
+	return p.MQTTEnabled
+}
+
+// MQTTServer returns the broker URI from the preferences.
+func (p *Preferences) GetMQTTServer() string {
+	return p.MQTTServer
+}
+
+// MQTTUser returns any username required for connecting to the broker from the
+// preferences.
+func (p *Preferences) GetMQTTUser() string {
+	return p.MQTTUser
+}
+
+// MQTTPassword returns any password required for connecting to the broker from the
+// preferences.
+func (p *Preferences) GetMQTTPassword() string {
+	return p.MQTTPassword
+}
+
 func defaultPreferences() *Preferences {
 	return &Preferences{
 		Version:      AppVersion,