From 8cbe8213539a9629ed2b3df102ec6efeba75dd45 Mon Sep 17 00:00:00 2001 From: Joshua Rich Date: Thu, 11 Jan 2024 10:01:57 +1000 Subject: [PATCH] refactor(agent): :recycle: move prefs lookup from global to local variable --- internal/agent/config/config.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/internal/agent/config/config.go b/internal/agent/config/config.go index 65431192e..c3e0f6ee8 100644 --- a/internal/agent/config/config.go +++ b/internal/agent/config/config.go @@ -240,21 +240,20 @@ type pref struct { viper string } -var prefs = map[string]pref{ - "PrefAPIURL": {fyne: "ApiURL", viper: "hass.apiurl"}, - "PrefWebsocketURL": {fyne: "WebSocketURL", viper: "hass.websocketurl"}, - "PrefCloudhookURL": {fyne: "CloudhookURL", viper: "hass.cloudhookurl"}, - "PrefRemoteUIURL": {fyne: "RemoteUIURL", viper: "hass.remoteuiurl"}, - "PrefToken": {fyne: "Token", viper: "hass.token"}, - "PrefWebhookID": {fyne: "WebhookID", viper: "hass.webhookid"}, - "PrefSecret": {fyne: "secret", viper: "hass.secret"}, - "PrefHost": {fyne: "Host", viper: "hass.host"}, - "PrefVersion": {fyne: "Version", viper: "agent.version"}, - "PrefDeviceName": {fyne: "DeviceName", viper: "device.name"}, - "PrefDeviceID": {fyne: "DeviceID", viper: "device.id"}, -} - func viperToFyne(configPath string) error { + prefs := map[string]pref{ + "PrefAPIURL": {fyne: "ApiURL", viper: "hass.apiurl"}, + "PrefWebsocketURL": {fyne: "WebSocketURL", viper: "hass.websocketurl"}, + "PrefCloudhookURL": {fyne: "CloudhookURL", viper: "hass.cloudhookurl"}, + "PrefRemoteUIURL": {fyne: "RemoteUIURL", viper: "hass.remoteuiurl"}, + "PrefToken": {fyne: "Token", viper: "hass.token"}, + "PrefWebhookID": {fyne: "WebhookID", viper: "hass.webhookid"}, + "PrefSecret": {fyne: "secret", viper: "hass.secret"}, + "PrefHost": {fyne: "Host", viper: "hass.host"}, + "PrefVersion": {fyne: "Version", viper: "agent.version"}, + "PrefDeviceName": {fyne: "DeviceName", viper: "device.name"}, + "PrefDeviceID": {fyne: "DeviceID", viper: "device.id"}, + } var err error fs, err := os.Stat(filepath.Join(configPath, "go-hass-agent.toml")) if fs != nil && err == nil {