Implement Klipper Upload

settings-example.json

@@ -3,12 +3,13 @@
         {
             "name": "Printer #1",
             "ip": "192.168.1.1",
-            "pw": "12345678"
+            "pw": "12345678",
+            "type": "Bambu"
         },
         {
             "name": "Printer #2",
             "ip": "192.168.1.2",
-            "pw": "12345678"
+            "type": "Klipper"
         }
     ]
 }

src/FarmUpload.py

@@ -4,7 +4,7 @@
 import json, os
 import threading, queue
 
-from Printer import Printer
+from Printer import BambuPrinter, KlipperPrinter
 from Log import Logger
 
 class App():
@@ -35,12 +35,21 @@ def loadSettings(self):
 
         for printer in self.settings["printers"]:
             var = tk.BooleanVar()
-            self.printers.append(Printer(
-                name = printer["name"],
-                ip = printer["ip"],
-                pw = printer["pw"],
-                enabled = var
-            ))
+            # switch for printer["type"]
+            if printer["type"] == "Bambu":
+                self.printers.append(BambuPrinter(
+                    name = printer["name"],
+                    ip = printer["ip"],
+                    pw = printer["pw"],
+                    enabled = var
+                ))
+            if printer["type"] == "Klipper":
+                self.printers.append(KlipperPrinter(
+                    name = printer["name"],
+                    ip = printer["ip"],
+                    enabled = var
+                ))
+
 
             checkbox = tk.Checkbutton(self.printerSelectFrame, text=printer["name"], variable=var, onvalue=True, offvalue=False)
             checkbox.pack(side=tk.LEFT, pady=10)
@@ -105,14 +114,15 @@ def sendOnePrinter(self, printer, toSend):
                     with open(os.path.join(self.fileDirectory,filename), 'rb') as file:
                         self.logQueue.put("Sending " + str(filename) + " to printer " + printer.name + "..." )
 
-                        printer.ftp.storbinary(f'STOR {filename}', file)
+                        printer.upload(file, filename)
+
                         self.logQueue.put("Success: " + str(filename) + " to printer " + printer.name)
 
                 except:
                     try:
                         with open(os.path.join(self.fileDirectory,filename), 'rb') as file:
                             self.logQueue.put("Reattempting to send " + str(filename) + " to printer " + printer["name"] + "..." )
-                            printer.ftp.storbinary(f'STOR {filename}', file)
+                            printer.upload(file, filename)
                             self.logQueue.put("Success: " + str(filename) + " to printer " + printer.name)
                     except:
                         self.logQueue.put("Failure: " + str(filename) + " to printer " + printer.name)
@@ -157,4 +167,4 @@ def send(self):
 
 
 if __name__ == "__main__":
-    app = App()
+    app = App()

src/Printer.py

@@ -1,19 +1,31 @@
-
 from BambuFTP import BambuFTP
+import requests
 
 class Printer():
-    def __init__(self, name, ip, pw, enabled):
-        self.name = name;
-        self.ip = ip;
-        self.pw = pw;
+    def __init__(self, name, ip, enabled):
+        self.name = name
+        self.ip = ip
         self.enabled = enabled
         self.connected = False
 
+    def connect(self):
+        raise NotImplementedError("Subclasses must implement this method")
+
+    def disconnect(self):
+        raise NotImplementedError("Subclasses must implement this method")
+
+    def upload(self):
+        raise NotImplementedError("Subclasses must implement this method")
+
+
+class BambuPrinter(Printer):
+    def __init__(self, name, ip, pw, enabled):
+        super().__init__(name, ip, enabled)
+        self.pw = pw
         self.ftp = BambuFTP()
         #self.ftp.set_debuglevel(2)
         self.ftp.set_pasv(True)
 
-
     def connect(self):
         try:
             self.ftp.connect(host=self.ip, port=990, timeout=10, source_address=None)
@@ -22,10 +34,38 @@ def connect(self):
             self.connected = True
         except:
             return False
-        
+
     def disconnect(self):
         try:
             self.ftp.quit()
             self.connected = False
         except:
             return False
+
+    def upload(self, file, filename):
+        if (not self.connected):
+            raise Exception("Printer not connected")
+        try:
+            self.ftp.storbinary(f'STOR {filename}', file)
+        except:
+            return False
+
+class KlipperPrinter(Printer):
+    def __init__(self, name, ip, enabled):
+        super().__init__(name, ip, enabled)
+
+    def connect(self):
+        infoResponse = requests.get(f'http://{self.ip}/server/info')
+        self.connected = infoResponse.ok
+        return self.connected
+
+    def disconnect(self):
+        return True
+
+    def upload(self, file, filename):
+
+        files = {
+            'file': (filename, file)
+        }
+        uploadResponse = requests.post(f'http://{self.ip}/server/files/upload', files=files)
+        return uploadResponse.ok