Klipper notifications (#118)

* Add custom notifications for Klipper Macros

* Add extra check

* Bump version to 2.1.13

Author: crysxd

moonraker_octoapp/moonrakerclient.py

@@ -316,6 +316,7 @@ def _OnWsOpenAndKlippyReady(self):
                 "webhooks": None,
                 "virtual_sdcard": None,
                 "history" : None,
+                "gcode_macro _OCTOAPP_STATUS": None,
             }
         })
 
@@ -403,6 +404,15 @@ def _OnWsNonResponseMessage(self, msg:str):
                     elif state == "complete":
                         self.MoonrakerCompat.OnDone()
                         return
+            
+            # Check for notifications
+            octoAppStatusContainerObj = self._GetWsMsgParam(msg, "gcode_macro _OCTOAPP_STATUS")
+            if octoAppStatusContainerObj is not None:
+                # Split text at ~~~ and take the first element (second half is CPU time to make the value change with same message repeated)
+                gcodeNotification = octoAppStatusContainerObj["gcode_macro _OCTOAPP_STATUS"].get("notify_message", None)
+                message = gcodeNotification.split("~~~")[0] if "~~~" in gcodeNotification else gcodeNotification
+                if message != "":
+                    self.MoonrakerCompat.OnCustomNotification(message)
 
             # Report progress. Do this after the others so they will report before a potential progress update.
             # Progress updates super frequently (like once a second) so there's plenty of chances.
@@ -912,6 +922,14 @@ def OnPrintPaused(self):
             fileName = stats["filename"]
         self.NotificationHandler.OnPaused(fileName)
 
+     # Called the the print is paused.
+    def OnCustomNotification(self, message):
+        # Only process notifications when ready, aka after state sync.
+        if self.IsReadyToProcessNotifications is False:
+            return
+
+        self.NotificationHandler.OnCustomNotification(message)
+
 
     # Called the the print is resumed.
     def OnPrintResumed(self):

octoprint_octoapp/webcamsnapshots.py

@@ -116,7 +116,7 @@ def _doContinuouslyUpdateSnapshots(self):
     def _updateSnapshotCache(self, webcamIndex, log):
         try:
             webcamSettings = self._getWebcamSettingsItem(webcamIndex)
-            snapshotUrl = webcamSettings.SnapshotUrl
+            snapshotUrl = webcamSettings.SnapshotUrl if webcamSettings is not None else ""
 
             if snapshotUrl == "" or snapshotUrl is None or (not snapshotUrl.startswith("http://") and not snapshotUrl.startswith("https://")):
                 return True

setup.py

@@ -22,7 +22,7 @@
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
 # Note that this is also parsed by the moonraker module to pull the version, so the string and format must remain the same!
-plugin_version = "2.1.12"
+plugin_version = "2.1.13"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module