snapshot

Author: DataEraserC

home/linux/gui/base/noctalia/config/plugins.json

@@ -1,24 +1,24 @@
 {
-  "sources": [
-    {
-      "enabled": true,
-      "name": "Noctalia Plugins",
-      "url": "https://github.com/noctalia-dev/noctalia-plugins"
-    }
-  ],
-  "states": {
-    "ip-monitor": {
-      "enabled": true,
-      "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+    "sources": [
+        {
+            "enabled": true,
+            "name": "Noctalia Plugins",
+            "url": "https://github.com/noctalia-dev/noctalia-plugins"
+        }
+    ],
+    "states": {
+        "ip-monitor": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        },
+        "keybind-cheatsheet": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        },
+        "privacy-indicator": {
+            "enabled": true,
+            "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
+        }
     },
-    "keybind-cheatsheet": {
-      "enabled": true,
-      "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
-    },
-    "privacy-indicator": {
-      "enabled": true,
-      "sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
-    }
-  },
-  "version": 2
+    "version": 2
 }

home/linux/gui/base/noctalia/config/plugins/ip-monitor/BarWidget.qml

@@ -41,8 +41,10 @@ Item {
   readonly property bool isVerticalBar: barPosition === "left" || barPosition === "right"
 
   readonly property string currentIcon: {
-    if (fetchState === "loading") return loadingIconKey;
-    if (fetchState === "error") return errorIconKey;
+    if (fetchState === "loading")
+      return loadingIconKey;
+    if (fetchState === "error")
+      return errorIconKey;
     return successIconKey;
   }
 
@@ -55,11 +57,11 @@ Item {
   onIpMonitorServiceChanged: {
     Logger.d("IpMonitor", "BarWidget ipMonitorService changed:", ipMonitorService !== null);
   }
-  
+
   onCurrentIpChanged: {
     Logger.d("IpMonitor", "BarWidget currentIp changed to:", currentIp);
   }
-  
+
   Component.onCompleted: {
     Logger.d("IpMonitor", "BarWidget completed refresh");
   }
@@ -84,8 +86,10 @@ Item {
         lines.push("");
         if (data.city || data.country) {
           var parts = [];
-          if (data.city) parts.push(data.city);
-          if (data.country) parts.push(data.country);
+          if (data.city)
+            parts.push(data.city);
+          if (data.country)
+            parts.push(data.country);
           lines.push(parts.join(", "));
         }
       }
@@ -144,4 +148,3 @@ Item {
     }
   }
 }
-

home/linux/gui/base/noctalia/config/plugins/ip-monitor/Main.qml

@@ -13,46 +13,58 @@ Item {
   // IP Monitor Service
   Item {
     id: service
-    
+
     property var ipData: null
     property string currentIp: "n/a"
     property string fetchState: "idle" // idle, loading, success, error
     property int lastFetchTime: 0
-    
+
     // Increment this to trigger refresh in all listening widgets (for IPC)
     property int refreshTrigger: 0
-    
+
     // Read global settings
     readonly property var cfg: root.pluginApi?.pluginSettings || ({})
     readonly property var defaults: root.pluginApi?.manifest?.metadata?.defaultSettings || ({})
     readonly property int refreshInterval: cfg.refreshInterval ?? defaults.refreshInterval ?? 300
-    
+
     // Process for fetching IP info
     property Process ipFetchProcess: Process {
       running: false
-      command: ["curl", "-s", "-m", "10", "https://ipinfo.io"]
+      command: ["curl", "-s", "-m", "10", "http://ip-api.com/json/?fields=status,continent,country,regionName,city,zip,lat,lon,timezone,currency,org,as,query"]
       stdout: StdioCollector {
         id: stdoutCollector
       }
       stderr: StdioCollector {
         id: stderrCollector
       }
-      
+
       onStarted: {
         service.fetchState = "loading";
         Logger.d("IpMonitor", "Service fetching IP info...");
       }
-      
-      onExited: function(exitCode, exitStatus) {
+
+      onExited: function (exitCode, exitStatus) {
         var output = stdoutCollector.text;
         Logger.d("IpMonitor", "Service process exited:", exitCode, "length:", output.length);
-        
+
         if (exitCode === 0 && output.length > 0) {
           try {
             var data = JSON.parse(output);
-            if (data.ip) {
-              service.ipData = data;
-              service.currentIp = data.ip;
+            if (data.status === "success") {
+              service.ipData = {
+                ip: data.query,
+                city: data.city || "n/a",
+                country: data.country || "n/a",
+                continent: data.continent || "n/a",
+                region: data.regionName || "n/a",
+                postal: data.zip || "n/a",
+                loc: (data.lat && data.lon) ? (data.lat + "," + data.lon) : "n/a",
+                timezone: data.timezone || "n/a",
+                currency: data.currency || "n/a",
+                org: data.org || "n/a",
+                as: data.as || "n/a"
+              };
+              service.currentIp = data.query;
               service.fetchState = "success";
               service.lastFetchTime = Date.now();
               Logger.d("IpMonitor", "Service IP fetched successfully:", service.currentIp);
@@ -73,20 +85,20 @@ Item {
         }
       }
     }
-    
+
     property Timer autoRefreshTimer: Timer {
       interval: service.refreshInterval * 1000
       running: interval > 0
       repeat: true
       onTriggered: service.fetchIp()
     }
-    
+
     Component.onCompleted: {
-      Logger.i("IpMonitor", "Service initialized, first time fetching IP.");
+      Logger.i("IpMonitor", "Service initialized, frist time fetching IP.");
       // Auto-fetch on startup
       Qt.callLater(() => fetchIp());
     }
-    
+
     function fetchIp() {
       if (!service.ipFetchProcess) {
         Logger.e("IpMonitor", "Service ipFetchProcess is null!");
@@ -99,7 +111,7 @@ Item {
         Logger.d("IpMonitor", "Service fetch already in progress");
       }
     }
-    
+
     function triggerRefresh() {
       Logger.d("IpMonitor", "Service triggerRefresh() called");
       refreshTrigger++;
@@ -115,20 +127,19 @@ Item {
   // IPC handlers
   IpcHandler {
     target: "plugin:ip-monitor"
-    
+
     function refreshIp() {
       Logger.i("IpMonitor", "IPC refreshIp() called");
       service.triggerRefresh();
       ToastService.showNotice("Refreshing IP info...");
     }
-    
+
     function toggle() {
       if (pluginApi) {
         pluginApi.withCurrentScreen(screen => {
-          pluginApi.openPanel(screen);
-        });
+					pluginApi.openPanel(screen);
+				});
       }
     }
   }
 }
-