feat: cleaned up Speed widget by refactoring download/upload to input…

…/output to make better logic for both modules: Disk and Network which have different meanings for these values.
exelban · Oct 26, 2024 · 905ce8f · 905ce8f
1 parent 68c45ab
commit 905ce8f
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 134 deletions.
diff --git a/Kit/Widgets/Speed.swift b/Kit/Widgets/Speed.swift
diff --git a/Kit/types.swift b/Kit/types.swift
@@ -103,11 +103,11 @@ internal enum StackMode: String {
 }
 
 internal let SensorsWidgetValue: [KeyValue_t] = [
-    KeyValue_t(key: "io", value: "Input/Output"),
-    KeyValue_t(key: "oi", value: "Output/Input"),
+    KeyValue_t(key: "oi", value: "output/input"),
+    KeyValue_t(key: "io", value: "input/output"),
     KeyValue_t(key: "separator", value: "separator"),
-    KeyValue_t(key: "i", value: "Input"),
-    KeyValue_t(key: "o", value: "Output")
+    KeyValue_t(key: "i", value: "input"),
+    KeyValue_t(key: "o", value: "output")
 ]
 
 internal let SensorsWidgetMode: [KeyValue_t] = [

diff --git a/Modules/Disk/config.plist b/Modules/Disk/config.plist
@@ -94,10 +94,19 @@
 			<key>Icon</key>
 			<string>chars</string>
 			<key>Symbols</key>
-			<array>
+			<dict>
+				<key>Output</key>
 				<string>W</string>
+				<key>Input</key>
 				<string>R</string>
-			</array>
+			</dict>
+			<key>Words</key>
+			<dict>
+				<key>Output</key>
+				<string>Write</string>
+				<key>Input</key>
+				<string>Read</string>
+			</dict>
 			<key>Order</key>
 			<integer>5</integer>
 		</dict>

diff --git a/Modules/Disk/main.swift b/Modules/Disk/main.swift
@@ -296,7 +296,7 @@ public class Disk: Module {
         self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: SWidget) in
             switch w.item {
             case let widget as SpeedWidget: 
-                widget.setValue(upload: d.activity.write, download: d.activity.read)
+                widget.setValue(input: d.activity.read, output: d.activity.write)
             case let widget as NetworkChart:
                 widget.setValue(upload: Double(d.activity.write), download: Double(d.activity.read))
                 if self.capacityReader?.interval != 1 {

diff --git a/Modules/Net/config.plist b/Modules/Net/config.plist
@@ -22,10 +22,19 @@
 			<key>Default</key>
 			<true/>
 			<key>Symbols</key>
-			<array>
+			<dict>
+				<key>Output</key>
 				<string>U</string>
+				<key>Input</key>
 				<string>D</string>
-			</array>
+			</dict>
+			<key>Words</key>
+			<dict>
+				<key>Output</key>
+				<string>Upload</string>
+				<key>Input</key>
+				<string>Download</string>
+			</dict>
 			<key>Order</key>
 			<integer>1</integer>
 		</dict>

diff --git a/Modules/Net/main.swift b/Modules/Net/main.swift
@@ -234,7 +234,7 @@ public class Network: Module {
 
         self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: SWidget) in
             switch w.item {
-            case let widget as SpeedWidget: widget.setValue(upload: upload, download: download)
+            case let widget as SpeedWidget: widget.setValue(input: download, output: upload)
             case let widget as NetworkChart: widget.setValue(upload: Double(upload), download: Double(download))
             case let widget as TextWidget:
                 var text = self.textValue