Merge pull request #42 from Isopolito/v16_merge

V16 merge
Isopolito · Dec 4, 2022 · 4a44389 · 4a44389
2 parents f4d5090 + 638fdfb
commit 4a44389
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 .idea
+*.orig
diff --git a/extension.js b/extension.js
@@ -87,7 +87,6 @@ const VpnIndicator = GObject.registerClass({
 
             let status = this._vpn.getStatus();
             status.loggedin = this.loggedin;
-
             status.currentState = this._vpn.isNordVpnRunning()
                 ? this.stateManager.resolveState(status)
                 : this.stateManager.resolveState(null);
@@ -308,7 +307,6 @@ const VpnIndicator = GObject.registerClass({
 
             this._vpn.applySettingsToNord();
             this._buildIndicatorMenu();
-
             this._refresh();
         }
 

diff --git a/metadata.json b/metadata.json
@@ -3,11 +3,9 @@
   "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.",
   "name": "gNordVPN-Local",
   "shell-version": [
-    "40",
-    "41",
-    "42"
+    "43"
   ],
   "url": "https://github.com/Isopolito/gNordVPN-Local",
   "uuid": "gnordvpn-local@isopolito",
-  "version": 15
+  "version": 16
 }
diff --git a/modules/CommonFavorite.js b/modules/CommonFavorite.js
@@ -25,7 +25,15 @@ var CommonFavorite = class CommonFavorite extends MenuBase {
         this._signals = new Signals();
     }
 
+    disable() {
+        this._isBuilt = false;
+        this._destroyMap = {};
+        this.favList = {};
+        this.itemList = {};
+    }
+
     updateFavorite() {
+
         let newFav = {};
 
         Object.keys(Constants.favorites).forEach(key => {
@@ -174,11 +182,4 @@ var CommonFavorite = class CommonFavorite extends MenuBase {
             this._favoriteMenu.show();
         }
     }
-
-    disable() {
-        this._isBuilt = false;
-        this._destroyMap = {};
-        this.favList = {};
-        this.itemList = {};
-    }
 }
diff --git a/modules/StateManager.js b/modules/StateManager.js
@@ -128,23 +128,26 @@ var StateManager = class StateManager {
             this.stateOverrideCounter += 1;
 
             let overrideFromKey = (this.stateOverride.overrideKeys && (
-                                  (this.stateOverride.overrideKeys[0] === 'countries' && this.stateOverride.overrideKeys[1].replace(/_/g, " ") === status.country) || 
-                                  (this.stateOverride.overrideKeys[0] === 'cities'    && this.stateOverride.overrideKeys[1].replace(/_/g, " ") === status.city) || 
-                                  (this.stateOverride.overrideKeys[0] === 'servers'   && this.stateOverride.overrideKeys[1] === status.currentServer.replace('.nordvpn.com',''))))
+                (this.stateOverride.overrideKeys[0] === 'countries' && this.stateOverride.overrideKeys[1].replace(/_/g, " ") === status.country) ||
+                (this.stateOverride.overrideKeys[0] === 'cities' && this.stateOverride.overrideKeys[1].replace(/_/g, " ") === status.city) ||
+                (this.stateOverride.overrideKeys[0] === 'servers' && this.stateOverride.overrideKeys[1] === status.currentServer.replace('.nordvpn.com', ''))))
 
-            if (this.stateOverrideCounter > this.STATE_OVERRIDE_DURATION || 
-              (vpnState.clearsOverrideId == this.stateOverride.overrideId) || overrideFromKey) {
+            if (this.stateOverrideCounter > this.STATE_OVERRIDE_DURATION ||
+                (vpnState.clearsOverrideId == this.stateOverride.overrideId) || overrideFromKey) {
                 // State override expired or cleared by current state, remove it
                 this.stateOverride = undefined;
                 this.stateOverrideCounter = 0;
 
-            } else { 
-               // State override still active
+            } else {
+                // State override still active
                 vpnState = this.stateOverride;
             }
-        } 
-
-        return {...vpnState, 'refreshTimeout': this.quickRefresh ? this.QUICK_REFRESH_TIMEOUT : vpnState['refreshTimeout'] };
+        }
+
+        return {
+            ...vpnState,
+            'refreshTimeout': this.quickRefresh ? this.QUICK_REFRESH_TIMEOUT : vpnState['refreshTimeout']
+        };
     }
 }
 
diff --git a/modules/Vpn.js b/modules/Vpn.js
@@ -3,6 +3,7 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Soup = imports.gi.Soup;
+
 const CMD_VPNSTATUS = `nordvpn status`;
 const CMD_VPNACCOUNT = `nordvpn account`;
 const CMD_COUNTRIES = `nordvpn countries`;
@@ -20,7 +21,7 @@ var Vpn = class Vpn {
         this.executeCommandAsync = GLib.spawn_command_line_async;
         this.settings = ExtensionUtils.getSettings(`org.gnome.shell.extensions.gnordvpn-local`);
         this.session = Soup.Session.new();
-        this.soupVersion = Soup.get_major_version(); 
+        this.soupVersion = Soup.get_major_version();
     }
 
     _httpGet = (url) => {
@@ -35,7 +36,7 @@ var Vpn = class Vpn {
         }
         return JSON.parse(this._getString(msg.response_body_data.get_data()));
     }
-    
+
     // Remove the junk that shows up from messages in the nordvpn output
     _processCityCountryOutput = (input) => {
         const match = input.match(/(^\w+?,\s(\w+?,\s)+?(\w+?$)|^\s*?\w+?\s*?$)/gm);
@@ -111,7 +112,6 @@ var Vpn = class Vpn {
         }
     }
 
-
     applySettingsToNord() {
         if (!this.isNordVpnRunning()) return;
 
@@ -134,7 +134,6 @@ var Vpn = class Vpn {
     }
 
     getAccount() {
-        // Read the VPN status from the command line
         const standardOut = this._executeCommand(CMD_VPNACCOUNT);
         const allAccountMessages = standardOut.split(`\n`);
 
@@ -153,7 +152,6 @@ var Vpn = class Vpn {
         return standardOut.replace(/\s+/g, ` `).includes('You are already logged in.');
     }
 
-
     getStatus() {
         const standardOut = this._executeCommand(CMD_VPNSTATUS);
         const allStatusMessages = standardOut.split(`\n`);
@@ -273,8 +271,8 @@ var Vpn = class Vpn {
         let processedCities = {};
 
         for (let i = 0; i < citiesSaved.length; i++) {
-            const standardOut = this._executeCommand(`${CMD_CITIES} ${citiesSaved[i]}`);
-            const cities = this._processCityCountryOutput(standardOut);
+            const [ok, standardOut, standardError, exitStatus] = this.executeCommandSync(`${CMD_CITIES} ${citiesSaved[i]}`);
+            const cities = this._processCityCountryOutput(this._getString(standardOut));
 
             for (let j = 0; j < cities.length; j++) {
                 if (j > citiesMax) break;
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     *.swp
     .idea
+    *.orig