From 3271fa1d23710c8a45cea3ebdc54c88f1e96b081 Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Mon, 8 Sep 2025 08:39:56 -0400
Subject: [PATCH] Init: better widget upgrading process + less warnings when
 starting up without config or cache

---
 Commons/Color.qml                 |  5 ++--
 Commons/Settings.qml              | 49 ++++++++++++++++---------------
 Modules/Background/Background.qml |  2 --
 Services/LocationService.qml      |  1 +
 Services/NetworkService.qml       |  1 +
 Services/NotificationService.qml  |  1 +
 6 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Commons/Color.qml b/Commons/Color.qml
index 7abc21f..7d1dc68 100644
--- a/Commons/Color.qml
+++ b/Commons/Color.qml
@@ -102,7 +102,8 @@ Singleton {
   // FileView to load custom colors data from colors.json
   FileView {
     id: customColorsFile
-    path: Settings.directoriesCreated ? (Settings.configDir + "colors.json") : ""
+    path: Settings.directoriesCreated ? (Settings.configDir + "colors.json") : undefined
+    printErrors: false
     watchChanges: true
     onFileChanged: {
       Logger.log("Color", "Reloading colors from disk")
@@ -115,7 +116,7 @@ Singleton {
 
     // Trigger initial load when path changes from empty to actual path
     onPathChanged: {
-      if (path === Settings.configDir + "colors.json") {
+      if (path !== undefined) {
         reload()
       }
     }
diff --git a/Commons/Settings.qml b/Commons/Settings.qml
index c6dbe3c..ba90c45 100644
--- a/Commons/Settings.qml
+++ b/Commons/Settings.qml
@@ -105,22 +105,19 @@ Singleton {
           continue
         }
 
-        // Check that the widget was not previously migrated and skip if necessary
-        const keys = Object.keys(widget)
-        if (keys.length > 1) {
-          continue
+        if (upgradeWidget(widget)) {
+          Logger.log("Settings", `Upgraded ${widget.id} widget:`, JSON.stringify(widget))
         }
-
-        migrateWidget(widget)
-        Logger.log("Settings", JSON.stringify(widget))
       }
     }
   }
 
   // -----------------------------------------------------
-  function migrateWidget(widget) {
-    Logger.log("Settings", `Migrating '${widget.id}' widget`)
+  function upgradeWidget(widget) {
+    // Backup the widget definition before altering
+    const widgetBefore = JSON.stringify(widget)
 
+    // Migrate old bar settings to proper per widget settings
     switch (widget.id) {
     case "ActiveWindow":
       widget.showIcon = adapter.bar.showActiveWindowIcon
@@ -128,23 +125,14 @@ Singleton {
     case "Battery":
       widget.alwaysShowPercentage = adapter.bar.alwaysShowBatteryPercentage
       break
-    case "Brightness":
-      widget.alwaysShowPercentage = BarWidgetRegistry.widgetMetadata[widget.id].alwaysShowPercentage
-      break
     case "Clock":
       widget.showDate = adapter.location.showDateWithClock
       widget.use12HourClock = adapter.location.use12HourClock
       widget.reverseDayMonth = adapter.location.reverseDayMonth
-      widget.showSeconds = BarWidgetRegistry.widgetMetadata[widget.id].showSeconds
       break
     case "MediaMini":
       widget.showAlbumArt = adapter.audio.showMiniplayerAlbumArt
       widget.showVisualizer = adapter.audio.showMiniplayerCava
-      widget.visualizerType = BarWidgetRegistry.widgetMetadata[widget.id].visualizerType
-      break
-    case "NotificationHistory":
-      widget.showUnreadBadge = BarWidgetRegistry.widgetMetadata[widget.id].showUnreadBadge
-      widget.hideWhenZero = BarWidgetRegistry.widgetMetadata[widget.id].hideWhenZero
       break
     case "SidePanelToggle":
       widget.useDistroLogo = adapter.bar.useDistroLogo
@@ -152,13 +140,27 @@ Singleton {
     case "SystemMonitor":
       widget.showNetworkStats = adapter.bar.showNetworkStats
       break
-    case "Volume":
-      widget.alwaysShowPercentage = BarWidgetRegistry.widgetMetadata[widget.id].alwaysShowPercentage
-      break
     case "Workspace":
       widget.labelMode = adapter.bar.showWorkspaceLabel
       break
     }
+
+    // Inject missing default setting (metaData) from BarWidgetRegistry
+    const keys = Object.keys(BarWidgetRegistry.widgetMetadata[widget.id])
+    for (let i=0; i<keys.length; i++) {
+      const k = keys[i]
+      if (k === "id" || k === "allowUserSettings") {
+        continue
+      }
+
+      if (!widget.hasOwnProperty(k)) {
+        widget[k] = BarWidgetRegistry.widgetMetadata[widget.id][k]
+      }
+    }
+
+    // Backup the widget definition before altering
+    const widgetAfter = JSON.stringify(widget)
+    return (widgetAfter !== widgetBefore)
   }
   // -----------------------------------------------------
   // Kickoff essential services
@@ -200,14 +202,15 @@ Singleton {
 
   FileView {
     id: settingsFileView
-    path: directoriesCreated ? settingsFile : ""
+    path: directoriesCreated ? settingsFile : undefined
+    printErrors: false
     watchChanges: true
     onFileChanged: reload()
     onAdapterUpdated: saveTimer.start()
 
     // Trigger initial load when path changes from empty to actual path
     onPathChanged: {
-      if (path === settingsFile) {
+      if (path !== undefined) {
         reload()
       }
     }
diff --git a/Modules/Background/Background.qml b/Modules/Background/Background.qml
index bf0ede5..56d184a 100644
--- a/Modules/Background/Background.qml
+++ b/Modules/Background/Background.qml
@@ -89,8 +89,6 @@ Variants {
         left: true
       }
 
-
-
       Timer {
         id: debounceTimer
         interval: 333
diff --git a/Services/LocationService.qml b/Services/LocationService.qml
index cfea5d7..fef295c 100644
--- a/Services/LocationService.qml
+++ b/Services/LocationService.qml
@@ -25,6 +25,7 @@ Singleton {
   FileView {
     id: locationFileView
     path: locationFile
+    printErrors: false
     onAdapterUpdated: saveTimer.start()
     onLoaded: {
       Logger.log("Location", "Loaded cached data")
diff --git a/Services/NetworkService.qml b/Services/NetworkService.qml
index 4e61618..6bf7ac5 100644
--- a/Services/NetworkService.qml
+++ b/Services/NetworkService.qml
@@ -30,6 +30,7 @@ Singleton {
   FileView {
     id: cacheFileView
     path: root.cacheFile
+    printErrors: false
 
     JsonAdapter {
       id: cacheAdapter
diff --git a/Services/NotificationService.qml b/Services/NotificationService.qml
index f30269f..7fdd4bd 100644
--- a/Services/NotificationService.qml
+++ b/Services/NotificationService.qml
@@ -65,6 +65,7 @@ Singleton {
     id: historyFileView
     objectName: "notificationHistoryFileView"
     path: historyFile
+    printErrors: false
     watchChanges: true
     onFileChanged: reload()
     onAdapterUpdated: writeAdapter()