From 8d8af75cb26aa765a614aa371607b7fdd1fcf63c Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 4 Dec 2025 08:43:01 +0100 Subject: [PATCH] add name to message and clean unused code --- __init__.py | 31 ------------------------------- sendMessage.py | 12 +++++++----- setup.py | 17 ----------------- 3 files changed, 7 insertions(+), 53 deletions(-) delete mode 100755 __init__.py delete mode 100755 setup.py diff --git a/__init__.py b/__init__.py deleted file mode 100755 index f289b55..0000000 --- a/__init__.py +++ /dev/null @@ -1,31 +0,0 @@ -from __future__ import absolute_import -import octoprint.plugin -import requests -import logging - -class WebhookOnPrintDone(octoprint.plugin.StartupPlugin, - octoprint.plugin.EventHandlerPlugin): - - def on_after_startup(self): - self._logger.info("WebhookOnPrintDone started!") - - def on_event(self, event, payload): - if event == "PrintDone": - self._logger.info("Print finished, sending webhook request...") - self.send_webhook(payload) - - def send_webhook(self, payload): - url = "https://smsapi.free-mobile.fr/sendmsg?user=58834922&pass=OgGZvJjNf5GCSU&to=0681952587&msg=Impression terminée" # Remplacez par l'URL réelle du webhook - try: - response = requests.get(url) - response.raise_for_status() - self._logger.info(f"Webhook sent successfully: {response.status_code}") - except requests.RequestException as e: - self._logger.error(f"Failed to send webhook: {e}") - -__plugin_name__ = "WebhookOnPrintDone" -__plugin_version__ = "1.0.0" - -def __plugin_load__(): - global __plugin_implementation__ - __plugin_implementation__ = WebhookOnPrintDone() diff --git a/sendMessage.py b/sendMessage.py index 5e78af9..e655e32 100644 --- a/sendMessage.py +++ b/sendMessage.py @@ -1,7 +1,10 @@ import octoprint.plugin +import requests -class SendMessagePlugin(octoprint.plugin.StartupPlugin): +class SendMessagePlugin( + octoprint.plugin.StartupPlugin, octoprint.plugin.EventHandlerPlugin +): def on_after_startup(self): self._logger.info("Send Message plugin started!") @@ -11,13 +14,12 @@ class SendMessagePlugin(octoprint.plugin.StartupPlugin): self.send_webhook(payload) def send_webhook(self, payload): - url = "https://smsapi.free-mobile.fr/sendmsg?user=58834922&pass=OgGZvJjNf5GCSU&to=0681952587&msg=Impression terminée" # Remplacez par l'URL réelle du webhook + url = "https://smsapi.free-mobile.fr/sendmsg?user=58834922&pass=OgGZvJjNf5GCSU&to=0681952587&msg=" # Remplacez par l'URL réelle du webhook + message = "Impression terminée : " + payload.name try: - response = requests.get(url) + response = requests.get(url + message) response.raise_for_status() self._logger.info(f"Webhook sent successfully: {response.status_code}") - self._logger.info("payload") - self._logger.info(payload) except requests.RequestException as e: self._logger.error(f"Failed to send webhook: {e}") diff --git a/setup.py b/setup.py deleted file mode 100755 index b16ed55..0000000 --- a/setup.py +++ /dev/null @@ -1,17 +0,0 @@ -from setuptools import setup - -setup( - name="OctoPrint-WebhookOnPrintDone", - version="1.0.0", - description="Un plugin OctoPrint qui envoie une requête webhook à la fin d'une impression.", - author="Ton Nom", - author_email="ton.email@example.com", - url="https://github.com/ton-repo", # Mettre un lien vers ton repo si tu en as un - packages=["octoprint_WebhookOnPrintDone"], - install_requires=["requests"], - entry_points={ - "octoprint.plugin": [ - "WebhookOnPrintDone = octoprint_WebhookOnPrintDone" - ] - }, -)