v0.1.1: Added network IP addresses

Author: Andy Werner

octoprint_netconnectd/__init__.py

@@ -7,6 +7,7 @@
 
 
 import logging
+import netifaces
 from flask import jsonify, make_response
 
 import octoprint.plugin
@@ -45,15 +46,14 @@ def get_settings_defaults(self):
 			socket="/var/run/netconnectd.sock",
 			hostname=None,
 			forwardUrl='http://find.mr-beam.org',
-			# ANDYTEST TODO: check timeouts
 			timeout=80
 		)
 
 	##~~ TemplatePlugin API
 
 	def get_template_configs(self):
 		return [
-			dict(type="settings", name="Network connection")
+			dict(type="settings", name="Network Connection")
 		]
 
 	##~~ SimpleApiPlugin API
@@ -85,7 +85,11 @@ def on_api_get(self, request):
 			wifis=wifis,
 			status=status,
 			hostname=self.hostname,
-			forwardUrl=self.forwardUrl
+			forwardUrl=self.forwardUrl,
+			ip_addresses=dict(
+				eth0=self._get_ip_address('eth0'),
+				wlan0=self._get_ip_address('wlan0')
+			)
 		))
 
 	def on_api_command(self, command, data, adminRequired=True):
@@ -238,6 +242,17 @@ def _send_message(self, message, data):
 		finally:
 			sock.close()
 
+	def _get_ip_address(self, interface):
+		"""
+		Returns the external IP address of the given interface
+		:param interface:
+		:return: String IP
+		"""
+		try:
+			return netifaces.ifaddresses(interface)[netifaces.AF_INET][0]['addr']
+		except:
+			pass
+
 __plugin_name__ = "Netconnectd Client"
 
 

octoprint_netconnectd/static/js/netconnectd.js

@@ -31,7 +31,11 @@ $(function() {
                 current_ssid: ko.observable(),
                 current_address: ko.observable(),
                 present: ko.observable()
-            }
+            },
+            ip_addresses: {
+				eth0: ko.observable(),
+				wlan0: ko.observable(),
+			}
         };
         self.statusCurrentWifi = ko.observable();
 
@@ -79,7 +83,27 @@ $(function() {
 
             return text;
         });
-        
+
+        self.connectionStateTextEthernet = ko.computed(function() {
+            if (self.status.connections.wired()) {
+                return "Connected (IP: " + self.status.ip_addresses.eth0() + ")";
+            } else {
+                return "Not connected";
+            }
+        });
+
+        self.connectionStateTextWifi = ko.computed(function() {
+            if (self.status.connections.ap()) {
+                return "Access point (IP: " + self.status.ip_addresses.wlan0() + ")";
+            } else if (self.status.connections.wifi() && self.status.wifi.current_ssid()) {
+                return _.sprintf(gettext("Connected to \"%(ssid)s\" (IP: %(ip)s)"), {ssid: self.status.wifi.current_ssid(), ip: self.status.ip_addresses.wlan0()});
+            } else if (self.status.connections.wifi()) {
+                return _.sprintf(gettext("Connected to unknown wifi (IP: %(ip)s)"), {ssid: self.status.wifi.current_ssid(), ip: self.status.ip_addresses.wlan0()});
+            } else {
+                return "Access point down, not connected";
+            }
+        });
+
         self.onAllBound = function(allViewModels) {
             self.allViewModels = allViewModels;
         }
@@ -159,6 +183,8 @@ $(function() {
             self.status.wifi.current_ssid(response.status.wifi.current_ssid);
             self.status.wifi.current_address(response.status.wifi.current_address);
             self.status.wifi.present(response.status.wifi.present);
+            self.status.ip_addresses.eth0(response.ip_addresses.eth0);
+            self.status.ip_addresses.wlan0(response.ip_addresses.wlan0);
 
             self.statusCurrentWifi(undefined);
             if (response.status.wifi.current_ssid && response.status.wifi.current_address) {

octoprint_netconnectd/templates/netconnectd_settings.jinja2

@@ -1,8 +1,10 @@
-<div id="settings_plugin_netconnectd_dialog" data-bind="allowBindings: true">
+<div id="settings_plugin_netconnectd_dialog" data-bind="allowBindings: true" class="scrollable" style="padding-bottom:2em; overflow-y: auto; height: calc(100vh - 100px);">
     <p>
-        <strong>{{ _('Connection state') }}:</strong> <span data-bind="text: connectionStateText"></span>
+        <strong>{{ _('Ethernet') }}:</strong> <span data-bind="text: connectionStateTextEthernet"></span>
+    </p>
+    <p>
+        <strong>{{ _('Wifi') }}:</strong> <span data-bind="text: connectionStateTextWifi"></span>
     </p>
-
     <div class="pull-right" data-bind="visible: enableQualitySorting">
         <small>
             {{ _('Sort by') }}: <a href="#" data-bind="click: function() { listHelper.changeSorting('ssid'); }">{{ _('SSID') }} ({{ _('ascending') }})</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('quality'); }">{{ _('Quality') }} ({{ _('descending') }})</a>

setup.py

@@ -5,12 +5,13 @@
 setuptools.setup(**octoprint_setuptools.create_plugin_setup_parameters(
 	identifier="netconnectd",
 	name="OctoPrint-Netconnectd",
-	version="0.1",
+	version="0.1.1",
 	description="Client for netconnectd that allows configuration of netconnectd through OctoPrint's settings dialog. It's only available for Linux right now.",
 	author="Gina Häußge",
 	mail="[email protected]",
 	url="http://github.com/OctoPrint/OctoPrint-Netconnectd",
 	requires=[
-		"OctoPrint"
+		"OctoPrint",
+		"netifaces"
 	]
 ))