fix(data): connect source when config is update

fix #7
orblazer · Oct 24, 2021 · 0e89d8d · 0e89d8d
1 parent c636423
commit 0e89d8d
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 37 deletions.
diff --git a/package/contents/ui/components/functions.js b/package/contents/ui/components/functions.js
@@ -62,6 +62,24 @@ function addGraphData(model, graphItemPercent, graphGranularity) {
 }
 
 
+/**
+ * Rate limit call of function
+ * @param {function} func The function want rate limit
+ * @param {number} [limit] The rate limit be seconds
+ * @returns The caller of 'func'
+ */
+function rateLimit(func, limit = 1) {
+  var limitStartTime = Date.now()
+
+  return function (...args) {
+    // magic to limit to x frames per second
+    if (Date.now() - limitStartTime >= limit) {
+      limitStartTime = limitStartTime + limit
+      func.apply(this, args)
+    }
+  }
+}
+
 /**
  * Get the usage int percent
  * @param {number} current The current usage

diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
@@ -92,13 +92,20 @@ Item {
         }
     }
 
+    onShowCpuMonitorChanged: dataSourceChanged()
     onShowClockChanged: {
+        dataSourceChanged()
         cpuMonitor.secondLineValueLabel.visible = showClock
     }
-
+    onShowRamMonitorChanged: dataSourceChanged()
     onShowSwapGraphChanged: {
+        dataSourceChanged()
         ramMonitor.secondLineValueLabel.visible = showSwapGraph
     }
+    onShowNetMonitorChanged: dataSourceChanged()
+    property var dataSourceChanged: Functions.rateLimit(function () {
+        dataSource.sources.forEach(refreshSource)
+    }, 1)
 
     // Graph data
 
@@ -187,48 +194,52 @@ Item {
             }
         }
         onSourceAdded: {
-            var needConnect = false
+            refreshSource(source)
+        }
+    }
 
-            if (source === dataSource.totalLoad) {
-                needConnect = showCpuMonitor
-            }
-            else if (source === dataSource.averageClock) {
-                needConnect = showClock
-            }
-            else if (source === dataSource.memFree || source === dataSource.memUsed || source === dataSource.memApplication) {
-                needConnect = showRamMonitor
-            }
-            else if (source === dataSource.swapUsed || source === dataSource.swapFree) {
-                needConnect = showSwapGraph
-            }
-            else if (dataSource.networkRegex.test(source)) {
-                // Match network sources
-                var match
-                if (plasmoid.configuration.networkSensorInterface === '') {
-                    match = source.match(dataSource.networkRegex)
-                } else {
-                    match = source.match(new RegExp('/^network\/interfaces\/' +
-                        plasmoid.configuration.networkSensorInterface.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') +
-                        '\/(transmitter|receiver)\/data$/'))
-                }
+    function refreshSource(source) {
+        var needConnect = false
 
-                if (match != null) {
-                    if (match[1] === 'receiver') {
-                        dataSource.downloadTotal = source
-                    } else {
-                        dataSource.uploadTotal = source
-                    }
-                    needConnect = showNetMonitor
-                }
+        if (source === dataSource.totalLoad) {
+            needConnect = showCpuMonitor
+        }
+        else if (source === dataSource.averageClock) {
+            needConnect = showClock
+        }
+        else if (source === dataSource.memFree || source === dataSource.memUsed || source === dataSource.memApplication) {
+            needConnect = showRamMonitor
+        }
+        else if (source === dataSource.swapUsed || source === dataSource.swapFree) {
+            needConnect = showSwapGraph
+        }
+        else if (dataSource.networkRegex.test(source)) {
+            // Match network sources
+            var match
+            if (plasmoid.configuration.networkSensorInterface === '') {
+                match = source.match(dataSource.networkRegex)
             } else {
-                return
+                match = source.match(new RegExp('/^network\/interfaces\/' +
+                    plasmoid.configuration.networkSensorInterface.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') +
+                    '\/(transmitter|receiver)\/data$/'))
             }
 
-            if (needConnect) {
-                dataSource.connectSource(source)
-            } else {
-                dataSource.disconnectSource(source)
+            if (match != null) {
+                if (match[1] === 'receiver') {
+                    dataSource.downloadTotal = source
+                } else {
+                    dataSource.uploadTotal = source
+                }
+                needConnect = showNetMonitor
             }
+        } else {
+            return
+        }
+
+        if (needConnect) {
+            dataSource.connectSource(source)
+        } else {
+            dataSource.disconnectSource(source)
         }
     }