add mac address to machine_data

Author: jneilliii

octoprint_simplyprint/__init__.py

@@ -428,7 +428,7 @@ def get_update_information(self):
 __plugin_name__ = "SimplyPrint Cloud"
 __plugin_pythoncompat__ = ">=3.7,<4"
 # Remember to bump the version in setup.py as well
-__plugin_version__ = "4.1.0rc1"
+__plugin_version__ = "4.1.0rc2"
 
 
 def __plugin_load__():

octoprint_simplyprint/websocket/system.py

@@ -58,6 +58,7 @@ def get_system_info(self) -> Dict[str, Any]:
         info["core_count"] = os.cpu_count()
         info["total_memory"] = psutil.virtual_memory().total
         info.update(self.get_network_info())
+        info["mac"] = self.get_mac_address()
 
         port = self._get_public_port()
 
@@ -69,6 +70,12 @@ def get_system_info(self) -> Dict[str, Any]:
     def _get_python_version(self) -> str:
         return ".".join(str(part) for part in sys.version_info[:3])
 
+    def get_mac_address():
+        mac_int = uuid.getnode()
+        mac_hex = "{:012x}".format(mac_int)
+        mac_address = ":".join(mac_hex[i:i + 2] for i in range(0, 12, 2)).upper()
+        return mac_address
+
     def _get_routed_ip(self) -> Optional[str]:
         src_ip = None
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

setup.py

@@ -14,7 +14,7 @@
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
 # Remember to bump the version in octoprint_simplyprint/__init__.py as well
-plugin_version = "4.1.0rc1"
+plugin_version = "4.1.0rc2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module