Merge pull request #25 from ManuelMcLure/add_extra_network_info

Add netmask/gateway information

Author: ManuelMcLure

octoprint_wifistatus/__init__.py

@@ -127,17 +127,28 @@ def update_wifi_status(self):
                 if self.showBSSID:
                     net_data["bssid"] = wifi.getAPaddr()
                 if self.showIPV4Addr:
-                    ipv4addrs = [
-                        ad["addr"] for ad in ni.ifaddresses(interface)[ni.AF_INET]
-                    ]
+                    ipv4addrs = []
+                    for ad in ni.ifaddresses(interface)[ni.AF_INET]:
+                        ipv4addrs.append(ad["addr"])
+                        if self.showNetmask:
+                            ipv4addrs.append("Netmask: " + ad["netmask"])
                     net_data["ipv4addrs"] = ipv4addrs
                 if self.showIPV6Addr:
-                    ipv6addrs = [
-                        ad["addr"]
-                        for ad in ni.ifaddresses(interface)[ni.AF_INET6]
-                        if not ad["addr"].endswith("%" + interface)
-                    ]
+                    ipv6addrs = []
+                    for ad in ni.ifaddresses(interface)[ni.AF_INET6]:
+                        if ad["addr"].endswith("%" + interface):
+                            continue
+                        ipv6addrs.append(ad["addr"])
+                        if self.showNetmask:
+                            ipv6addrs.append("Netmask: " + ad["netmask"])
                     net_data["ipv6addrs"] = ipv6addrs
+                if self.showGateway:
+                    gateways = []
+                    gws = ni.gateways()
+                    for af in [ni.AF_INET, ni.AF_INET6]:
+                        for gw in gws[af]:
+                            gateways.append(gw[0] + " " + gw[1] + (" (Default)" if gw[2] else ""))
+                    net_data["gateways"] = gateways
 
             self._logger.debug(net_data)
 
@@ -167,6 +178,8 @@ def get_settings_defaults(self):
             "showFrequency": False,
             "showIPV4Addr": False,
             "showIPV6Addr": False,
+            "showNetmask": False,
+            "showGateway": False,
         }
 
     def on_settings_load(self):
@@ -176,6 +189,8 @@ def on_settings_load(self):
             "showFrequency": self._settings.get_boolean(["showFrequency"]),
             "showIPV4Addr": self._settings.get_boolean(["showIPV4Addr"]),
             "showIPV6Addr": self._settings.get_boolean(["showIPV6Addr"]),
+            "showNetmask": self._settings.get_boolean(["showNetmask"]),
+            "showGateway": self._settings.get_boolean(["showGateway"]),
         }
 
     def on_settings_initialized(self):
@@ -184,6 +199,8 @@ def on_settings_initialized(self):
         self.showFrequency = self._settings.get_boolean(["showFrequency"])
         self.showIPV4Addr = self._settings.get_boolean(["showIPV4Addr"])
         self.showIPV6Addr = self._settings.get_boolean(["showIPV6Addr"])
+        self.showNetmask = self._settings.get_boolean(["showNetmask"])
+        self.showGateway = self._settings.get_boolean(["showGateway"])
 
     def on_settings_save(self, data):
         octoprint.plugin.SettingsPlugin.on_settings_save(self, data)

octoprint_wifistatus/static/js/wifistatus.js

@@ -20,6 +20,14 @@ $(function () {
       '<table style="width: 100%"><thead></thead><tbody><tr><td>No Connection</td></tr></tbody></table>'
     );
 
+    self.enableNetmask = function () {
+      if (self.settings) {
+        return self.settings.showIPV4Addr() || self.settings.showIPV6Addr();
+      } else {
+        return false;
+      }
+    };
+
     self.onSettingsShown = function () {
       OctoPrint.simpleApiGet("wifistatus").done(function (response) {
         self.interfaces(response.interfaces);
@@ -95,11 +103,29 @@ $(function () {
             title = "";
           }
         }
+        if (data.gateways) {
+          var title = "Gateways:";
+          var i;
+          for (i = 0; i < data.gateways.length; i++) {
+            wifiData +=
+              "<tr><td>" +
+              title +
+              "</td><td>" +
+              data.gateways[i] +
+              "</td></tr>";
+            title = "";
+          }
+        }
       }
       wifiData += "</tbody></table>";
       self.IconSVG(svg);
       self.popoverContent(wifiData);
     };
+
+    self.onBeforeBinding = function () {
+      self.settings = self.settingsViewModel.settings.plugins.wifistatus;
+    };
+
   }
 
   OCTOPRINT_VIEWMODELS.push({

octoprint_wifistatus/templates/wifistatus_settings.jinja2

@@ -7,29 +7,39 @@
         optionsText: function(iface) {
           return (iface===null ? 'AUTO' : iface)
         },
-        value: settingsViewModel.settings.plugins.wifistatus.interface"></select>
+        value: settings.interface"></select>
     </div>
   </div>
   <div class="control-group">
     <div class="controls">
       <label class="checkbox">
-        <input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.wifistatus.showFrequency"> Show frequency
+        <input type="checkbox" data-bind="checked: settings.showFrequency"> Show frequency
       </label>
     </div>
   </div>
   <div class="control-group">
     <div class="controls">
-      <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.wifistatus.showBSSID"> Show Access Point BSSID</label>
+      <label class="checkbox"><input type="checkbox" data-bind="checked: settings.showBSSID">Show Access Point BSSID</label>
     </div>
   </div>
   <div class="control-group">
     <div class="controls">
-      <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.wifistatus.showIPV4Addr"> Show IPV4 address(es)</label>
+      <label class="checkbox"><input type="checkbox" data-bind="checked: settings.showIPV4Addr">Show IPV4 address(es)</label>
     </div>
   </div>
   <div class="control-group">
     <div class="controls">
-      <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.wifistatus.showIPV6Addr"> Show IPV6 address(es)</label>
+      <label class="checkbox"><input type="checkbox" data-bind="checked: settings.showIPV6Addr">Show IPV6 address(es)</label>
+    </div>
+  </div>
+  <div class="control-group" data-bind="visible: enableNetmask()">
+    <div class="controls">
+      <label class="checkbox"><input type="checkbox" data-bind="checked: settings.showNetmask">Show netmask(s)</label>
+    </div>
+  </div>
+  <div class="control-group">
+    <div class="controls">
+      <label class="checkbox"><input type="checkbox" data-bind="checked: settings.showGateway">Show gateway(s)</label>
     </div>
   </div>
 </form>

setup.py

@@ -5,7 +5,7 @@
 plugin_identifier = "wifistatus"
 plugin_package = "octoprint_{}".format(plugin_identifier)
 plugin_name = "WiFi Status"
-plugin_version = "1.7.2"
+plugin_version = "1.8.0"
 plugin_description = "Displays WiFi status on the navbar"
 plugin_author = "Manuel McLure"
 plugin_author_email = "manuel@mclure.org"