0.0.23

* fix thumbnail url for avi based timelapse, #30

README.md

@@ -1,17 +1,11 @@
 # OctoPrint-BambuPrinter
 
-**TODO:** Describe what your plugin does.
+## System Requirements
+
+* Python 3.9 or higher (OctoPi 1.0.0)
 
 ## Setup
 
-Install via the bundled [Plugin Manager](https://docs.octoprint.org/en/master/bundledplugins/pluginmanager.html)
-or manually using this URL:
+Install manually using this URL:
 
     https://github.com/jneilliii/OctoPrint-BambuPrinter/archive/master.zip
-
-**TODO:** Describe how to install your plugin, if more needs to be done than just installing it via pip or through
-the plugin manager.
-
-## Configuration
-
-**TODO:** Describe your plugin's configuration options (if any).

octoprint_bambu_printer/__init__.py

@@ -1,20 +1,35 @@
 # coding=utf-8
 from __future__ import absolute_import
 
+import os
 import threading
 import time
+import flask
+import datetime
 
 import octoprint.plugin
-
+from octoprint.events import Events
+from octoprint.util import get_formatted_size, get_formatted_datetime, is_hidden_path
+from octoprint.server.util.flask import no_firstrun_access
+from octoprint.server.util.tornado import LargeResponseHandler, UrlProxyHandler, path_validation_factory
+from octoprint.access.permissions import Permissions
+from urllib.parse import quote as urlquote
 from .ftpsclient import IoTFTPSClient
 
 
-class BambuPrintPlugin(
-    octoprint.plugin.SettingsPlugin, octoprint.plugin.TemplatePlugin
-):
+class BambuPrintPlugin(octoprint.plugin.SettingsPlugin,
+                       octoprint.plugin.TemplatePlugin,
+                       octoprint.plugin.AssetPlugin,
+                       octoprint.plugin.EventHandlerPlugin,
+                       octoprint.plugin.SimpleApiPlugin,
+                       octoprint.plugin.BlueprintPlugin):
 
+
+    def get_assets(self):
+        return {'js': ["js/bambu_printer.js"]}
     def get_template_configs(self):
-        return [{"type": "settings", "custom_bindings": False}]
+        return [{"type": "settings", "custom_bindings": True},
+                {"type": "generic", "custom_bindings": True, "template": "bambu_timelapse.jinja2"}] #, {"type": "generic", "custom_bindings": True, "template": "bambu_printer.jinja2"}]
 
     def get_settings_defaults(self):
         return {"device_type": "X1C",
@@ -31,8 +46,26 @@ class BambuPrintPlugin(
                 "local_mqtt": True,
                 "region": "",
                 "email": "",
-                "auth_token": ""}
+                "auth_token": "",
+                "always_use_default_options": False
+                }
 
+    def is_api_adminonly(self):
+        return True
+
+    def get_api_commands(self):
+        return {"register": ["email", "password", "region", "auth_token"]}
+    def on_api_command(self, command, data):
+        if command == "register":
+            if "email" in data and "password" in data and "region" in data and "auth_token" in data:
+                self._logger.info(f"Registering user {data['email']}")
+                from pybambu import BambuCloud
+                bambu_cloud = BambuCloud(data["region"], data["email"], data["password"], data["auth_token"])
+                bambu_cloud.login(data["region"], data["email"], data["password"])
+                return flask.jsonify({"auth_token": bambu_cloud.auth_token, "username": bambu_cloud.username})
+    def on_event(self, event, payload):
+        if event == Events.TRANSFER_DONE:
+            self._printer.commands("M20 L T", force=True)
     def support_3mf_files(self):
         return {'machinecode': {'3mf': ["3mf"]}}
 
@@ -50,7 +83,7 @@ class BambuPrintPlugin(
                     elapsed = time.monotonic() - elapsed
                     sd_upload_succeeded(filename, filename, elapsed)
                     # remove local file after successful upload to Bambu
-                    self._file_manager.remove_file("local", filename)
+                    # self._file_manager.remove_file("local", filename)
                 else:
                     raise Exception("upload failed")
             except Exception as e:
@@ -64,6 +97,9 @@ class BambuPrintPlugin(
 
         return filename
 
+    def get_template_vars(self):
+        return {"plugin_version": self._plugin_version}
+
     def virtual_printer_factory(self, comm_instance, port, baudrate, read_timeout):
         if not port == "BAMBU":
             return None
@@ -101,6 +137,103 @@ class BambuPrintPlugin(
         else:
             return []
 
+    def get_timelapse_file_list(self):
+        if flask.request.path.startswith('/api/timelapse'):
+            def process():
+                host = self._settings.get(["host"])
+                access_code = self._settings.get(["access_code"])
+                return_file_list = []
+
+                try:
+                    ftp = IoTFTPSClient(f"{host}", 990, "bblp", f"{access_code}", ssl_implicit=True)
+                    if self._settings.get(["device_type"]) in ["X1", "X1C"]:
+                        timelapse_file_list = ftp.list_files("timelapse/", ".mp4") or []
+                    else:
+                        timelapse_file_list = ftp.list_files("timelapse/", ".avi") or []
+
+                    for entry in timelapse_file_list:
+                        if entry.startswith("/"):
+                            filename = entry[1:].replace("timelapse/", "")
+                        else:
+                            filename = entry.replace("timelapse/", "")
+
+                        filesize = ftp.ftps_session.size(f"timelapse/{filename}")
+                        date_str = ftp.ftps_session.sendcmd(f"MDTM timelapse/{filename}").replace("213 ", "")
+                        filedate = datetime.datetime.strptime(date_str, "%Y%m%d%H%M%S").replace(tzinfo=datetime.timezone.utc).timestamp()
+
+                        return_file_list.append(
+                            {
+                                "bytes": filesize,
+                                "date": get_formatted_datetime(datetime.datetime.fromtimestamp(filedate)),
+                                "name": filename,
+                                "size": get_formatted_size(filesize),
+                                "thumbnail": "/plugin/bambu_printer/thumbnail/" + filename.replace(".mp4", ".jpg").replace(".avi", ".jpg"),
+                                "timestamp": filedate,
+                                "url": f"/plugin/bambu_printer/timelapse/{filename}"
+                            })
+
+                    self._plugin_manager.send_plugin_message(self._identifier, {'files': return_file_list})
+
+                except Exception as e:
+                    self._logger.debug(f"Error getting timelapse files: {e}")
+
+            thread = threading.Thread(target=process)
+            thread.daemon = True
+            thread.start()
+
+
+    def _hook_octoprint_server_api_before_request(self, *args, **kwargs):
+        return [self.get_timelapse_file_list]
+
+    @octoprint.plugin.BlueprintPlugin.route("/timelapse/<filename>", methods=["GET"])
+    @octoprint.server.util.flask.restricted_access
+    @no_firstrun_access
+    @Permissions.TIMELAPSE_DOWNLOAD.require(403)
+    def downloadTimelapse(self, filename):
+        dest_filename = os.path.join(self.get_plugin_data_folder(), filename)
+        host = self._settings.get(["host"])
+        access_code = self._settings.get(["access_code"])
+
+        if not os.path.exists(dest_filename):
+            ftp = IoTFTPSClient(f"{host}", 990, "bblp", f"{access_code}", ssl_implicit=True)
+            download_result = ftp.download_file(
+                source=f"timelapse/{filename}",
+                dest=dest_filename,
+            )
+
+        return flask.redirect("/plugin/bambu_printer/download/timelapse/" + urlquote(filename), code=302)
+
+    @octoprint.plugin.BlueprintPlugin.route("/thumbnail/<filename>", methods=["GET"])
+    @octoprint.server.util.flask.restricted_access
+    @no_firstrun_access
+    @Permissions.TIMELAPSE_DOWNLOAD.require(403)
+    def downloadThumbnail(self, filename):
+        dest_filename = os.path.join(self.get_plugin_data_folder(), filename)
+        host = self._settings.get(["host"])
+        access_code = self._settings.get(["access_code"])
+
+        if not os.path.exists(dest_filename):
+            ftp = IoTFTPSClient(f"{host}", 990, "bblp", f"{access_code}", ssl_implicit=True)
+            download_result = ftp.download_file(
+                source=f"timelapse/thumbnail/{filename}",
+                dest=dest_filename,
+            )
+
+        return flask.redirect("/plugin/bambu_printer/download/thumbnail/" + urlquote(filename), code=302)
+
+    def is_blueprint_csrf_protected(self):
+        return True
+
+    def route_hook(self, server_routes, *args, **kwargs):
+        return [
+            (r"/download/timelapse/(.*)", LargeResponseHandler,
+             {'path': self.get_plugin_data_folder(), 'as_attachment': True, 'path_validation': path_validation_factory(
+                 lambda path: not is_hidden_path(path), status_code=404)}),
+            (r"/download/thumbnail/(.*)", LargeResponseHandler,
+             {'path': self.get_plugin_data_folder(), 'as_attachment': True, 'path_validation': path_validation_factory(
+                 lambda path: not is_hidden_path(path), status_code=404)})
+        ]
+
     def get_update_information(self):
         return {'bambu_printer': {'displayName': "Bambu Printer",
                                   'displayVersion': self._plugin_version,
@@ -136,4 +269,6 @@ def __plugin_load__():
         "octoprint.filemanager.extension_tree": __plugin_implementation__.support_3mf_files,
         "octoprint.printer.sdcardupload": __plugin_implementation__.upload_to_sd,
         "octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information,
+        "octoprint.server.api.before_request": __plugin_implementation__._hook_octoprint_server_api_before_request,
+        "octoprint.server.http.routes": __plugin_implementation__.route_hook
     }

octoprint_bambu_printer/ftpsclient/__init__.py

@@ -1,2 +1 @@
-from ._client import IoTFTPSClient
-from ._version import __version__
+from .ftpsclient import IoTFTPSClient

octoprint_bambu_printer/ftpsclient/_client.py

@@ -1,159 +0,0 @@
-"""wrapper for FTPS server interactions"""
-
-import ftplib
-import ssl
-from typing import List, Optional, Union
-
-
-class ImplicitTLS(ftplib.FTP_TLS):
-    """ftplib.FTP_TLS sub-class to support implicit SSL FTPS"""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._sock = None
-
-    @property
-    def sock(self):
-        """return socket"""
-        return self._sock
-
-    @sock.setter
-    def sock(self, value):
-        """wrap and set SSL socket"""
-        if value is not None and not isinstance(value, ssl.SSLSocket):
-            value = self.context.wrap_socket(value)
-        self._sock = value
-
-    def ntransfercmd(self, cmd, rest=None):
-        conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
-        if self._prot_p:
-            conn = self.context.wrap_socket(conn,
-                                            server_hostname=self.host,
-                                            session=self.sock.session)  # this is the fix
-        return conn, size
-
-
-class IoTFTPSClient:
-    """iot ftps ftpsclient"""
-
-    ftps_host: str
-    ftps_port: int
-    ftps_user: str
-    ftps_pass: str
-    ssl_implicit: bool
-    ftps_session: Union[ftplib.FTP, ImplicitTLS]
-
-    def __init__(
-        self,
-        ftps_host: str,
-        ftps_port: Optional[int] = 21,
-        ftps_user: Optional[str] = "",
-        ftps_pass: Optional[str] = "",
-        ssl_implicit: Optional[bool] = False,
-    ) -> None:
-        self.ftps_host = ftps_host
-        self.ftps_port = ftps_port
-        self.ftps_user = ftps_user
-        self.ftps_pass = ftps_pass
-        self.ssl_implicit = ssl_implicit
-        self.instantiate_ftps_session()
-
-    def __repr__(self) -> str:
-        return (
-            "IoT FTPS Client\n"
-            "--------------------\n"
-            f"host: {self.ftps_host}\n"
-            f"port: {self.ftps_port}\n"
-            f"user: {self.ftps_user}\n"
-            f"ssl: {self.ssl_implicit}"
-        )
-
-    def instantiate_ftps_session(self) -> None:
-        """init ftps_session based on input params"""
-        try:
-            if self.ssl_implicit:
-                self.ftps_session = ImplicitTLS()
-            else:
-                self.ftps_session = ftplib.FTP()
-
-            self.ftps_session.connect(host=self.ftps_host, port=self.ftps_port)
-
-            if self.ftps_user != "" and self.ftps_pass != "":
-                self.ftps_session.login(user=self.ftps_user, passwd=self.ftps_pass)
-            else:
-                self.ftps_session.login()
-
-            if self.ssl_implicit:
-                self.ftps_session.prot_p()
-
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return
-
-    def disconnect(self) -> None:
-        """disconnect the current session from the ftps server"""
-        try:
-            self.ftps_session.close()
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return
-
-    def download_file(self, source: str, dest: str) -> bool:
-        """download a file to a path on the local filesystem"""
-        try:
-            with open(dest, "wb") as file:
-                self.ftps_session.retrbinary(f"RETR {source}", file.write)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def upload_file(self, source: str, dest: str) -> bool:
-        """upload a file to a path inside the FTPS server"""
-        try:
-            with open(source, "rb") as file:
-                self.ftps_session.storbinary(f"STOR {dest}", file)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def delete_file(self, path: str) -> bool:
-        """delete a file from under a path inside the FTPS server"""
-        try:
-            self.ftps_session.delete(path)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def move_file(self, source: str, dest: str) -> bool:
-        """move a file inside the FTPS server to another path inside the FTPS server"""
-        try:
-            self.ftps_session.rename(source, dest)
-            return True
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return False
-
-    def list_files(
-        self, path: str, file_pattern: Optional[str] = None
-    ) -> Union[List[str], None]:
-        """list files under a path inside the FTPS server"""
-        try:
-            files = self.ftps_session.nlst(path)
-            if not files:
-                return
-            if file_pattern:
-                return [f for f in files if file_pattern in f]
-            return files
-        except Exception as ex:
-            print(f"unexpected exception occurred: {ex}")
-            pass
-        return

octoprint_bambu_printer/ftpsclient/_version.py

@@ -1,3 +0,0 @@
-VERSION = "1.1.1"
-
-__version__ = VERSION

octoprint_bambu_printer/ftpsclient/ftpsclient.py

@@ -0,0 +1,228 @@
+"""
+Based on: <https://github.com/dgonzo27/py-iot-utils>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+wrapper for FTPS server interactions
+"""
+
+import ftplib
+import os
+import socket
+import ssl
+from typing import Optional, Union, List
+
+from contextlib import redirect_stdout
+import io
+import re
+
+class ImplicitTLS(ftplib.FTP_TLS):
+    """ftplib.FTP_TLS sub-class to support implicit SSL FTPS"""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._sock = None
+
+    @property
+    def sock(self):
+        """return socket"""
+        return self._sock
+
+    @sock.setter
+    def sock(self, value):
+        """wrap and set SSL socket"""
+        if value is not None and not isinstance(value, ssl.SSLSocket):
+            value = self.context.wrap_socket(value)
+        self._sock = value
+
+    def ntransfercmd(self, cmd, rest=None):
+        conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
+
+        if self._prot_p:
+            conn = self.context.wrap_socket(conn,
+                                            server_hostname=self.host,
+                                            session=self.sock.session)  # this is the fix
+        return conn, size
+
+
+class IoTFTPSClient:
+    """iot ftps ftpsclient"""
+
+    ftps_host: str
+    ftps_port: int
+    ftps_user: str
+    ftps_pass: str
+    ssl_implicit: bool
+    ftps_session: Union[ftplib.FTP, ImplicitTLS]
+    last_error: Optional[str] = None
+    welcome: str
+
+    def __init__(
+            self,
+            ftps_host: str,
+            ftps_port: Optional[int] = 21,
+            ftps_user: Optional[str] = "",
+            ftps_pass: Optional[str] = "",
+            ssl_implicit: Optional[bool] = False,
+    ) -> None:
+        self.ftps_host = ftps_host
+        self.ftps_port = ftps_port
+        self.ftps_user = ftps_user
+        self.ftps_pass = ftps_pass
+        self.ssl_implicit = ssl_implicit
+        self.instantiate_ftps_session()
+
+    def __repr__(self) -> str:
+        return (
+            "IoT FTPS Client\n"
+            "--------------------\n"
+            f"host: {self.ftps_host}\n"
+            f"port: {self.ftps_port}\n"
+            f"user: {self.ftps_user}\n"
+            f"ssl: {self.ssl_implicit}"
+        )
+
+    def instantiate_ftps_session(self) -> None:
+        """init ftps_session based on input params"""
+        self.ftps_session = ImplicitTLS() if self.ssl_implicit else ftplib.FTP()
+        self.ftps_session.set_debuglevel(0)
+
+        self.welcome = self.ftps_session.connect(
+            host=self.ftps_host, port=self.ftps_port)
+
+        if self.ftps_user and self.ftps_pass:
+            self.ftps_session.login(user=self.ftps_user, passwd=self.ftps_pass)
+        else:
+            self.ftps_session.login()
+
+        if self.ssl_implicit:
+            self.ftps_session.prot_p()
+
+    def disconnect(self) -> None:
+        """disconnect the current session from the ftps server"""
+        self.ftps_session.close()
+
+    def download_file(self, source: str, dest: str):
+        """download a file to a path on the local filesystem"""
+        with open(dest, "wb") as file:
+            self.ftps_session.retrbinary(f"RETR {source}", file.write)
+
+    def upload_file(self, source: str, dest: str, callback=None) -> bool:
+        """upload a file to a path inside the FTPS server"""
+
+        file_size = os.path.getsize(source)
+
+        block_size = max(file_size // 100, 8192)
+        rest = None
+
+        try:
+            # Taken from ftplib.storbinary but with custom ssl handling
+            # due to the shitty bambu p1p ftps server TODO fix properly.
+            with open(source, "rb") as fp:
+                self.ftps_session.voidcmd('TYPE I')
+
+                with self.ftps_session.transfercmd(f"STOR {dest}", rest) as conn:
+                    while 1:
+                        buf = fp.read(block_size)
+
+                        if not buf:
+                            break
+
+                        conn.sendall(buf)
+
+                        if callback:
+                            callback(buf)
+
+                    # shutdown ssl layer
+                    if ftplib._SSLSocket is not None and isinstance(conn, ftplib._SSLSocket):
+                        # Yeah this is suposed to be conn.unwrap
+                        # But since we operate in prot p mode
+                        # we can close the connection always.
+                        # This is cursed but it works.
+                        if "vsFTPd" in self.welcome:
+                            conn.unwrap()
+                        else:
+                            conn.shutdown(socket.SHUT_RDWR)
+
+                return True
+        except Exception as ex:
+            print(f"unexpected exception occurred: {ex}")
+            pass
+        return False
+
+    def delete_file(self, path: str) -> bool:
+        """delete a file from under a path inside the FTPS server"""
+        try:
+            self.ftps_session.delete(path)
+            return True
+        except Exception as ex:
+            print(f"unexpected exception occurred: {ex}")
+            pass
+        return False
+
+    def move_file(self, source: str, dest: str):
+        """move a file inside the FTPS server to another path inside the FTPS server"""
+        self.ftps_session.rename(source, dest)
+
+    def mkdir(self, path: str) -> str:
+        return self.ftps_session.mkd(path)
+
+    def list_files(self, path: str, file_pattern: Optional[str] = None) -> Union[List[str], None]:
+        """list files under a path inside the FTPS server"""
+        try:
+            files = self.ftps_session.nlst(path)
+            if not files:
+                return
+            if file_pattern:
+                return [f for f in files if file_pattern in f]
+            return files
+        except Exception as ex:
+            print(f"unexpected exception occurred: {ex}")
+            pass
+        return
+
+    def list_files_ex(self, path: str) -> Union[list[str], None]:
+        """list files under a path inside the FTPS server"""
+        try:
+            f = io.StringIO()
+            with redirect_stdout(f):
+                self.ftps_session.dir(path)
+            s = f.getvalue()
+            files = []
+            for row in s.split("\n"):
+                if len(row) <= 0: continue
+
+                attribs = row.split(" ")
+
+                match = re.search(r".*\ (\d\d\:\d\d|\d\d\d\d)\ (.*)", row)
+                name = ""
+                if match:
+                    name = match.groups(1)[1]
+                else:
+                    name = attribs[len(attribs) - 1]
+
+                file = ( attribs[0], name )
+                files.append(file)
+            return files
+        except Exception as ex:
+            print(f"unexpected exception occurred: [{ex}]")
+            pass
+        return

octoprint_bambu_printer/static/js/bambu_printer.js

@@ -4,26 +4,145 @@
  * Author: jneilliii
  * License: AGPLv3
  */
-$(function() {
+
+$(function () {
     function Bambu_printerViewModel(parameters) {
         var self = this;
 
-        // assign the injected parameters, e.g.:
-        // self.loginStateViewModel = parameters[0];
-        // self.settingsViewModel = parameters[1];
+        self.settingsViewModel = parameters[0];
+        self.filesViewModel = parameters[1];
+        self.loginStateViewModel = parameters[2];
+        self.accessViewModel = parameters[3];
+        self.timelapseViewModel = parameters[4];
 
-        // TODO: Implement your plugin's view model here.
+        self.getAuthToken = function (data) {
+            self.settingsViewModel.settings.plugins.bambu_printer.auth_token("");
+            OctoPrint.simpleApiCommand("bambu_printer", "register", {
+                "email": self.settingsViewModel.settings.plugins.bambu_printer.email(),
+                "password": $("#bambu_cloud_password").val(),
+                "region": self.settingsViewModel.settings.plugins.bambu_printer.region(),
+                "auth_token": self.settingsViewModel.settings.plugins.bambu_printer.auth_token()
+            })
+                .done(function (response) {
+                    console.log(response);
+                    self.settingsViewModel.settings.plugins.bambu_printer.auth_token(response.auth_token);
+                    self.settingsViewModel.settings.plugins.bambu_printer.username(response.username);
+                });
+        };
+
+                // initialize list helper
+        self.listHelper = new ItemListHelper(
+            "timelapseFiles",
+            {
+                name: function (a, b) {
+                    // sorts ascending
+                    if (a["name"].toLocaleLowerCase() < b["name"].toLocaleLowerCase())
+                        return -1;
+                    if (a["name"].toLocaleLowerCase() > b["name"].toLocaleLowerCase())
+                        return 1;
+                    return 0;
+                },
+                date: function (a, b) {
+                    // sorts descending
+                    if (a["date"] > b["date"]) return -1;
+                    if (a["date"] < b["date"]) return 1;
+                    return 0;
+                },
+                size: function (a, b) {
+                    // sorts descending
+                    if (a["bytes"] > b["bytes"]) return -1;
+                    if (a["bytes"] < b["bytes"]) return 1;
+                    return 0;
+                }
+            },
+            {},
+            "name",
+            [],
+            [],
+            CONFIG_TIMELAPSEFILESPERPAGE
+        );
+
+        self.onDataUpdaterPluginMessage = function(plugin, data) {
+            if (plugin != "bambu_printer") {
+                return;
+            }
+
+            if (data.files !== undefined) {
+                console.log(data.files);
+                self.listHelper.updateItems(data.files);
+                self.listHelper.resetPage();
+            }
+        };
+
+        self.onBeforeBinding = function () {
+            $('#bambu_timelapse').appendTo("#timelapse");
+        };
+
+        self.showTimelapseThumbnail = function(data) {
+            $("#bambu_printer_timelapse_thumbnail").attr("src", data.thumbnail);
+            $("#bambu_printer_timelapse_preview").modal('show');
+        };
+
+        /*$('#files div.upload-buttons > span.fileinput-button:first, #files div.folder-button').remove();
+        $('#files div.upload-buttons > span.fileinput-button:first').removeClass('span6').addClass('input-block-level');
+
+        self.onBeforePrintStart = function(start_print_command) {
+            let confirmation_html = '' +
+                '            <div class="row-fluid form-vertical">\n' +
+                '                <div class="control-group">\n' +
+                '                    <label class="control-label">' + gettext("Plate Number") + '</label>\n' +
+                '                    <div class="controls">\n' +
+                '                        <input type="number" min="1" value="1" id="bambu_printer_plate_number" class="input-mini">\n' +
+                '                    </div>\n' +
+                '                </div>\n' +
+                '            </div>';
+
+            if(!self.settingsViewModel.settings.plugins.bambu_printer.always_use_default_options()){
+                confirmation_html += '\n' +
+                    '            <div class="row-fluid">\n' +
+                    '                <div class="span6">\n' +
+                    '                    <label class="checkbox"><input id="bambu_printer_timelapse" type="checkbox"' + ((self.settingsViewModel.settings.plugins.bambu_printer.timelapse()) ? ' checked' : '') + '> ' + gettext("Enable timelapse") + '</label>\n' +
+                    '                    <label class="checkbox"><input id="bambu_printer_bed_leveling" type="checkbox"' + ((self.settingsViewModel.settings.plugins.bambu_printer.bed_leveling()) ? ' checked' : '') + '> ' + gettext("Enable bed leveling") + '</label>\n' +
+                    '                    <label class="checkbox"><input id="bambu_printer_flow_cali" type="checkbox"' + ((self.settingsViewModel.settings.plugins.bambu_printer.flow_cali()) ? ' checked' : '') + '> ' + gettext("Enable flow calibration") + '</label>\n' +
+                    '                </div>\n' +
+                    '                <div class="span6">\n' +
+                    '                    <label class="checkbox"><input id="bambu_printer_vibration_cali" type="checkbox"' + ((self.settingsViewModel.settings.plugins.bambu_printer.vibration_cali()) ? ' checked' : '') + '> ' + gettext("Enable vibration calibration") + '</label>\n' +
+                    '                    <label class="checkbox"><input id="bambu_printer_layer_inspect" type="checkbox"' + ((self.settingsViewModel.settings.plugins.bambu_printer.layer_inspect()) ? ' checked' : '') + '> ' + gettext("Enable first layer inspection") + '</label>\n' +
+                    '                    <label class="checkbox"><input id="bambu_printer_use_ams" type="checkbox"' + ((self.settingsViewModel.settings.plugins.bambu_printer.use_ams()) ? ' checked' : '') + '> ' + gettext("Use AMS") + '</label>\n' +
+                    '                </div>\n' +
+                    '            </div>\n';
+            }
+
+            showConfirmationDialog({
+                title: "Bambu Print Options",
+                html: confirmation_html,
+                cancel: gettext("Cancel"),
+                proceed: [gettext("Print"), gettext("Always")],
+                onproceed: function (idx) {
+                    if(idx === 1){
+                        self.settingsViewModel.settings.plugins.bambu_printer.timelapse($('#bambu_printer_timelapse').is(':checked'));
+                        self.settingsViewModel.settings.plugins.bambu_printer.bed_leveling($('#bambu_printer_bed_leveling').is(':checked'));
+                        self.settingsViewModel.settings.plugins.bambu_printer.flow_cali($('#bambu_printer_flow_cali').is(':checked'));
+                        self.settingsViewModel.settings.plugins.bambu_printer.vibration_cali($('#bambu_printer_vibration_cali').is(':checked'));
+                        self.settingsViewModel.settings.plugins.bambu_printer.layer_inspect($('#bambu_printer_layer_inspect').is(':checked'));
+                        self.settingsViewModel.settings.plugins.bambu_printer.use_ams($('#bambu_printer_use_ams').is(':checked'));
+                        self.settingsViewModel.settings.plugins.bambu_printer.always_use_default_options(true);
+                        self.settingsViewModel.saveData();
+                    }
+                    // replace this with our own print command API call?
+                    start_print_command();
+                },
+                nofade: true
+            });
+            return false;
+        };*/
     }
 
-    /* view model class, parameters for constructor, container to bind to
-     * Please see http://docs.octoprint.org/en/master/plugins/viewmodels.html#registering-custom-viewmodels for more details
-     * and a full list of the available options.
-     */
     OCTOPRINT_VIEWMODELS.push({
         construct: Bambu_printerViewModel,
         // ViewModels your plugin depends on, e.g. loginStateViewModel, settingsViewModel, ...
-        dependencies: [ /* "loginStateViewModel", "settingsViewModel" */ ],
+        dependencies: ["settingsViewModel", "filesViewModel", "loginStateViewModel", "accessViewModel", "timelapseViewModel"],
         // Elements to bind to, e.g. #settings_plugin_bambu_printer, #tab_plugin_bambu_printer, ...
-        elements: [ /* ... */ ]
+        elements: ["#bambu_printer_print_options", "#settings_plugin_bambu_printer", "#bambu_timelapse"]
     });
 });

octoprint_bambu_printer/templates/bambu_printer_settings.jinja2

@@ -1,40 +1,78 @@
-<h3>Virtual Printer</h3>
+<h3>Bambu Printer Settings <small>{{ _('Version') }} {{ plugin_bambu_printer_plugin_version }}</small></h3>
 
 <form class="form-horizontal" onsubmit="return false;">
     <div class="control-group">
         <label class="control-label">{{ _('Device Type') }}</label>
         <div class="controls">
-            <select class="input-block-level" data-bind="options: ['A1', 'A1MINI', 'P1P', 'P1S', 'X1', 'X1C'], value: settings.plugins.bambu_printer.device_type, allowUnset: true">
+            <select class="input-block-level" data-bind="options: ['A1', 'A1MINI', 'P1P', 'P1S', 'X1', 'X1C'], value: settingsViewModel.settings.plugins.bambu_printer.device_type, allowUnset: true">
             </select>
         </div>
     </div>
 	<div class="control-group">
 		<label class="control-label">{{ _('IP Address') }}</label>
 		<div class="controls">
-			<input type="text" class="input-block-level" data-bind="value: settings.plugins.bambu_printer.host" placeholder="192.168.0.2" title="{{ _('IP address or hostname of the printer') }}"></input>
+			<input type="text" class="input-block-level" data-bind="value: settingsViewModel.settings.plugins.bambu_printer.host" placeholder="192.168.0.2" title="{{ _('IP address or hostname of the printer') }}"></input>
 		</div>
 	</div>
 	<div class="control-group">
 		<label class="control-label">{{ _('Serial Number') }}</label>
 		<div class="controls">
-			<input type="text" class="input-block-level" data-bind="value: settings.plugins.bambu_printer.serial" title="{{ _('Serial number of printer') }}"></input>
+			<input type="text" class="input-block-level" data-bind="value: settingsViewModel.settings.plugins.bambu_printer.serial" title="{{ _('Serial number of printer') }}"></input>
 		</div>
 	</div>
 	<div class="control-group">
 		<label class="control-label">{{ _('Access Code') }}</label>
 		<div class="controls">
-			<input type="text" class="input-block-level" data-bind="value: settings.plugins.bambu_printer.access_code" title="{{ _('Access code of printer') }}"></input>
+			<input type="text" class="input-block-level" data-bind="value: settingsViewModel.settings.plugins.bambu_printer.access_code" title="{{ _('Access code of printer') }}"></input>
+		</div>
+	</div>
+    <div class="control-group">
+        <div class="controls">
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.local_mqtt"> {{ _('Use Local Access, disable for cloud connection') }}</label>
+        </div>
+    </div>
+	<div class="control-group" data-bind="visible: !settingsViewModel.settings.plugins.bambu_printer.local_mqtt()">
+		<label class="control-label">{{ _('Region') }}</label>
+		<div class="controls">
+			<input type="text" class="input-block-level" data-bind="value: settingsViewModel.settings.plugins.bambu_printer.region" title="{{ _('Region used to connect, ie China, US') }}"></input>
+		</div>
+	</div>
+	<div class="control-group" data-bind="visible: !settingsViewModel.settings.plugins.bambu_printer.local_mqtt()">
+		<label class="control-label">{{ _('Email') }}</label>
+		<div class="controls">
+			<input type="text" class="input-block-level" data-bind="value: settingsViewModel.settings.plugins.bambu_printer.email" title="{{ _('Registered email address') }}"></input>
+		</div>
+	</div>
+	<div class="control-group" data-bind="visible: !settingsViewModel.settings.plugins.bambu_printer.local_mqtt()">
+		<label class="control-label">{{ _('Password') }}</label>
+		<div class="controls">
+            <div class="input-block-level input-append">
+			    <input id="bambu_cloud_password" type="password" class="input-text input-block-level" title="{{ _('Password to generate Auth Token') }}"></input>
+                <span class="btn btn-primary add-on" data-bind="click: getAuthToken">{{ _('Login') }}</span>
+            </div>
+		</div>
+	</div>
+	<div class="control-group" data-bind="visible: !settingsViewModel.settings.plugins.bambu_printer.local_mqtt()">
+		<label class="control-label">{{ _('Auth Token') }}</label>
+		<div class="controls">
+			<input type="text" class="input-block-level" data-bind="value: settingsViewModel.settings.plugins.bambu_printer.auth_token" title="{{ _('Auth Token') }}"></input>
 		</div>
 	</div>
 	<div class="control-group">
-        <label class="control-label">{{ _('Print Options') }}</label>
+        <label class="control-label">{{ _('Default Print Options') }}</label>
         <div class="controls">
-            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.timelapse"> {{ _('Enable timelapse') }}</label>
-            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.bed_leveling"> {{ _('Enable bed leveling') }}</label>
-            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.flow_cali"> {{ _('Enable flow calibration') }}</label>
-            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.vibration_cali"> {{ _('Enable vibration calibration') }}</label>
-            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.layer_inspect"> {{ _('Enable first layer inspection') }}</label>
-            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.use_ams"> {{ _('Use AMS') }}</label>
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.timelapse"> {{ _('Enable timelapse') }}</label>
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.bed_leveling"> {{ _('Enable bed leveling') }}</label>
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.flow_cali"> {{ _('Enable flow calibration') }}</label>
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.vibration_cali"> {{ _('Enable vibration calibration') }}</label>
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.layer_inspect"> {{ _('Enable first layer inspection') }}</label>
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settingsViewModel.settings.plugins.bambu_printer.use_ams"> {{ _('Use AMS') }}</label>
         </div>
     </div>
+	{#<div class="control-group">
+        <label class="control-label">{{ _('Always Use Default') }}</label>
+        <div class="controls">
+            <label class="checkbox"><input type="checkbox" data-bind="checked: settings.plugins.bambu_printer.always_use_default_options"> </label>
+        </div>
+    </div>#}
 </form>

octoprint_bambu_printer/templates/bambu_timelapse.jinja2

@@ -0,0 +1,71 @@
+<div class="row-fluid" id="bambu_timelapse">
+    <h1>{{ _('Bambu Timelapses') }}</h1>
+
+    <div class="pull-right">
+        <div class="btn-group">
+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fas fa-wrench"></i> <span class="caret"></span></button>
+            <ul class="dropdown-menu dropdown-menu-right">
+                <li><a href="javascript:void(0)" data-bind="click: function() { listHelper.changeSorting('name'); }"><i class="fas fa-check" data-bind="style: {visibility: listHelper.currentSorting() == 'name' ? 'visible' : 'hidden'}"></i> {{ _('Sort by name') }} ({{ _('ascending') }})</a></li>
+                <li><a href="javascript:void(0)" data-bind="click: function() { listHelper.changeSorting('date'); }"><i class="fas fa-check" data-bind="style: {visibility: listHelper.currentSorting() == 'date' ? 'visible' : 'hidden'}"></i> {{ _('Sort by date') }} ({{ _('descending') }})</a></li>
+                <li><a href="javascript:void(0)" data-bind="click: function() { listHelper.changeSorting('size'); }"><i class="fas fa-check" data-bind="style: {visibility: listHelper.currentSorting() == 'size' ? 'visible' : 'hidden'}"></i> {{ _('Sort by file size') }} ({{ _('descending') }})</a></li>
+            </ul>
+        </div>
+    </div>
+    <table class="table table-hover table-condensed table-hover" id="bambu_timelapse_files">
+        <thead>
+        <tr>
+            <th class="timelapse_files_thumb"></th>
+            <th class="timelapse_files_details">{{ _('Details') }}</th>
+            <th class="timelapse_files_action">{{ _('Action') }}</th>
+        </tr>
+        </thead>
+        <tbody data-bind="foreach: listHelper.paginatedItems">
+        <tr data-bind="attr: {title: name}">
+            <td class="timelapse_files_thumb">
+                <div class="thumb" data-bind="css: { letterbox: $data.thumbnail }">
+                    <!-- ko if: $data.thumbnail -->
+                    <img data-bind="attr:{src: thumbnail}" loading="lazy" style="aspect-ratio: 3 / 2;"/>
+                    <!-- /ko -->
+                    <a href="javascript:void(0)" data-bind="css: {disabled: !$root.timelapseViewModel.isTimelapseViewable($data)}, click: $root.showTimelapseThumbnail"></a>
+                </div>
+            </td>
+            <td class="timelapse_files_details">
+                <p class="name" data-bind="text: name"></p>
+                <p class="detail">{{ _('Recorded:') }} <span data-bind="text: formatTimeAgo(timestamp)"/></p>
+                <p class="detail">{{ _('Size:') }} <span data-bind="text: size"/></p>
+            </td>
+            <td class="timelapse_files_action">
+                <div class="btn-group action-buttons">
+                    <a href="javascript:void(0)" class="btn btn-mini" data-bind="css: {disabled: !$root.loginStateViewModel.hasPermissionKo($root.accessViewModel.permissions.TIMELAPSE_DOWNLOAD)()}, attr: { href: ($root.loginStateViewModel.hasPermission($root.accessViewModel.permissions.TIMELAPSE_DOWNLOAD)) ? $data.url : 'javascript:void(0)' }"><i class="fas fa-download"></i></a>
+                </div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+    <div class="pagination pagination-mini pagination-centered">
+        <ul>
+            <li data-bind="css: {disabled: listHelper.currentPage() === 0}"><a href="javascript:void(0)" data-bind="click: listHelper.prevPage">«</a></li>
+        </ul>
+        <ul data-bind="foreach: listHelper.pages">
+            <li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }"><a href="javascript:void(0)" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a></li>
+        </ul>
+        <ul>
+            <li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="javascript:void(0)" data-bind="click: listHelper.nextPage">»</a></li>
+        </ul>
+    </div>
+</div>
+
+<div id="bambu_printer_timelapse_preview" class="modal hide fade">
+	<div class="modal-header">
+		<a href="#" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+		<h3>{{ _('Timelapse Thumbnail') }}</h3>
+	</div>
+    <div class="modal-body">
+        <div class="row-fluid">
+            <img id="bambu_printer_timelapse_thumbnail" src="" class="row-fluid" style="aspect-ratio: 3 / 2;"/>
+        </div>
+	</div>
+	<div class="modal-footer">
+		<a href="#" class="btn" data-dismiss="modal" aria-hidden="true">{{ _('Close') }}</a>
+	</div>
+</div>

octoprint_bambu_printer/virtual.py

@@ -4,6 +4,7 @@ __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agp
 
 import collections
 import datetime
+import math
 import os
 import queue
 import re
@@ -68,8 +69,10 @@ class BambuPrinter:
         self._sdCardReady = True
         self._sdPrinter = None
         self._sdPrinting = False
+        self._sdPrintStarting = False
         self._sdPrintingSemaphore = threading.Event()
         self._sdPrintingPausedSemaphore = threading.Event()
+        self._sdFileListCache = {}
         self._selectedSdFile = None
         self._selectedSdFileSize = 0
         self._selectedSdFilePos = 0
@@ -78,6 +81,7 @@ class BambuPrinter:
         self._busy_loop = None
 
 
+
         import logging
 
         self._logger = logging.getLogger(
@@ -157,6 +161,9 @@ class BambuPrinter:
             fans = device_data.fans.__dict__
             speed = device_data.speed.__dict__
 
+            # self._logger.debug(device_data)
+
+            self.lastTempAt = time.monotonic()
             self.temp[0] = temperatures.get("nozzle_temp", 0.0)
             self.targetTemp[0] = temperatures.get("target_nozzle_temp", 0.0)
             self.bedTemp = temperatures.get("bed_temp", 0.0)
@@ -168,9 +175,19 @@ class BambuPrinter:
                     self._sdPrintingSemaphore.set()
                 if self._sdPrintingPausedSemaphore.is_set():
                     self._sdPrintingPausedSemaphore.clear()
+                self._sdPrintStarting = False
                 if not self._sdPrinting:
                     filename = print_job.get("subtask_name")
-                    # TODO: swap this out to use 8 dot 3 name based on long name/path
+                    if not self._sdFileListCache.get(filename.lower()):
+                        if self._sdFileListCache.get(f"{filename.lower()}.3mf"):
+                            filename = f"{filename.lower()}.3mf"
+                        elif self._sdFileListCache.get(f"{filename.lower()}.gcode.3mf"):
+                            filename = f"{filename.lower()}.gcode.3mf"
+                        elif filename.startswith("cache/"):
+                            filename = filename[6:]
+                        else:
+                            self._logger.debug(f"No 3mf file found for {print_job}")
+
                     self._selectSdFile(filename)
                     self._startSdPrint(from_printer=True)
 
@@ -185,9 +202,12 @@ class BambuPrinter:
                     self._send("// action:paused")
                     self._sendPaused()
 
-            if print_job.get("gcode_state") == "FINISH" and self._sdPrintingSemaphore.is_set():
-                self._selectedSdFilePos = self._selectedSdFileSize
-                self._finishSdPrint()
+            if print_job.get("gcode_state") == "FINISH" or print_job.get("gcode_state") == "FAILED":
+                if self._sdPrintStarting is False:
+                    self._sdPrinting = False
+                if self._sdPrintingSemaphore.is_set():
+                    self._selectedSdFilePos = self._selectedSdFileSize
+                    self._finishSdPrint()
     def _create_connection(self):
         if (self._settings.get(["device_type"]) != "" and
             self._settings.get(["serial"]) != "" and
@@ -197,24 +217,31 @@ class BambuPrinter:
         ):
             asyncio.run(self._create_connection_async())
 
+    def on_disconnect(self, on_disconnect):
+        self._logger.debug(f"on disconnect called")
+        return on_disconnect
+
+    def on_connect(self, on_connect):
+        self._logger.debug(f"on connect called")
+        return on_connect
+
     async def _create_connection_async(self):
+        self._logger.debug(f"connecting via local mqtt: {self._settings.get_boolean(['local_mqtt'])}")
         self.bambu = BambuClient(device_type=self._settings.get(["device_type"]),
                                  serial=self._settings.get(["serial"]),
                                  host=self._settings.get(["host"]),
-                                 username=self._settings.get(["username"]),
+                                 username="bblp" if self._settings.get_boolean(["local_mqtt"]) else self._settings.get(["username"]),
                                  access_code=self._settings.get(["access_code"]),
                                  local_mqtt=self._settings.get_boolean(["local_mqtt"]),
                                  region=self._settings.get(["region"]),
                                  email=self._settings.get(["email"]),
                                  auth_token=self._settings.get(["auth_token"])
                                  )
-
+        self.bambu.on_disconnect = self.on_disconnect(self.bambu.on_disconnect)
+        self.bambu.on_connect = self.on_connect(self.bambu.on_connect)
         self.bambu.connect(callback=self.new_update)
         self._logger.info(f"bambu connection status: {self.bambu.connected}")
         self._sendOk()
-        # while True:
-        #     await asyncio.sleep(self.tick_rate)
-        #     self._processTemperatureQuery()
 
     def __str__(self):
         return "BAMBU(read_timeout={read_timeout},write_timeout={write_timeout},options={options})".format(
@@ -241,6 +268,7 @@ class BambuPrinter:
 
             self._sdCardReady = True
             self._sdPrinting = False
+            self._sdPrintStarting = False
             if self._sdPrinter:
                 self._sdPrinting = False
                 self._sdPrintingSemaphore.clear()
@@ -429,6 +457,14 @@ class BambuPrinter:
                     else:
                         self._sendOk()
 
+                    if self.bambu.connected:
+                        GCODE_COMMAND = commands.SEND_GCODE_TEMPLATE
+                        GCODE_COMMAND['print']['param'] = data + "\n"
+                        if self.bambu.publish(GCODE_COMMAND):
+                            self._logger.info("command sent successfully")
+                            self._sendOk()
+                            continue
+
                 finally:
                     self._logger.debug(f"{data}")
 
@@ -474,13 +510,18 @@ class BambuPrinter:
 
     def _gcode_M524(self, data: str) -> bool:
         if self._sdCardReady:
-            self._cancelSdPrint()
+            return self._cancelSdPrint()
         return False
 
     def _gcode_M26(self, data: str) -> bool:
-        self._logger.debug("ignoring M26 command.")
-        self._send("M26 disabled for Bambu")
-        return True
+        if data == "M26 S0":
+            if self._sdCardReady:
+                return self._cancelSdPrint()
+            return False
+        else:
+            self._logger.debug("ignoring M26 command.")
+            self._send("M26 disabled for Bambu")
+            return True
 
     def _gcode_M27(self, data: str) -> bool:
         def report():
@@ -509,8 +550,8 @@ class BambuPrinter:
 
     # noinspection PyUnusedLocal
     def _gcode_M29(self, data: str) -> bool:
-        self._logger.debug("ignoring M28 command.")
-        self._send("M28 disabled for Bambu")
+        self._logger.debug("ignoring M29 command.")
+        self._send("M29 disabled for Bambu")
         return True
 
     def _gcode_M30(self, data: str) -> bool:
@@ -526,8 +567,7 @@ class BambuPrinter:
 
     # noinspection PyUnusedLocal
     def _gcode_M105(self, data: str) -> bool:
-        self._processTemperatureQuery()
-        return True
+        return self._processTemperatureQuery()
 
     # noinspection PyUnusedLocal
     def _gcode_M115(self, data: str) -> bool:
@@ -560,6 +600,26 @@ class BambuPrinter:
                 self._send(text)
         return True
 
+    # noinspection PyUnusedLocal
+    def _gcode_M220(self, data: str) -> bool:
+        if self.bambu.connected:
+            gcode_command = commands.SEND_GCODE_TEMPLATE
+            percent = int(data[1:])
+
+            if percent is None or percent < 1 or percent > 166:
+                return True
+
+            speed_fraction = 100 / percent
+            acceleration = math.exp((speed_fraction - 1.0191) / -0.814)
+            feed_rate = (2.1645 * (acceleration ** 3) - 5.3247 * (acceleration ** 2) + 4.342 * acceleration - 0.181)
+            speed_level = 1.539 * (acceleration ** 2) - 0.7032 * acceleration + 4.0834
+            speed_command = f"M204.2 K${acceleration:.2f} \nM220 K${feed_rate:.2f} \nM73.2 R${speed_fraction:.2f} \nM1002 set_gcode_claim_speed_level ${speed_level:.0f}\n"
+
+            gcode_command['print']['param'] = speed_command
+            if self.bambu.publish(gcode_command):
+                self._logger.info(f"{percent}% speed adjustment command sent successfully")
+        return True
+
     # noinspection PyUnusedLocal
     def _gcode_M400(self, data: str) -> bool:
         return True
@@ -625,7 +685,7 @@ class BambuPrinter:
         access_code = self._settings.get(["access_code"])
 
         ftp = IoTFTPSClient(f"{host}", 990, "bblp", f"{access_code}", ssl_implicit=True)
-        filelist = ftp.list_files("", ".3mf")
+        filelist = ftp.list_files("", ".3mf") or []
 
         for entry in filelist:
             if entry.startswith("/"):
@@ -643,30 +703,58 @@ class BambuPrinter:
                 "size": filesize,
                 "timestamp": unix_timestamp_to_m20_timestamp(int(filedate))
             }
-            result[filename.lower()] = data
             result[dosname.lower()] = filename.lower()
+            result[filename.lower()] = data
+
+        filelistcache = ftp.list_files("cache/", ".3mf") or []
+
+        for entry in filelistcache:
+            if entry.startswith("/"):
+                filename = entry[1:].replace("cache/", "")
+            else:
+                filename = entry.replace("cache/", "")
+            filesize = ftp.ftps_session.size(f"cache/{filename}")
+            date_str = ftp.ftps_session.sendcmd(f"MDTM cache/{filename}").replace("213 ", "")
+            filedate = datetime.datetime.strptime(date_str, "%Y%m%d%H%M%S").replace(tzinfo=datetime.timezone.utc).timestamp()
+            dosname = get_dos_filename(filename, existing_filenames=list(result.keys())).lower()
+            data = {
+                "dosname": dosname,
+                "name": filename,
+                "path": "cache/"+filename,
+                "size": filesize,
+                "timestamp": unix_timestamp_to_m20_timestamp(int(filedate))
+            }
+            result[dosname.lower()] = filename.lower()
+            result[filename.lower()] = data
 
         return result
 
     def _getSdFileData(self, filename: str) -> Optional[Dict[str, Any]]:
-        files = self._mappedSdList()
-        data = files.get(filename.lower())
+        self._logger.debug(f"_getSdFileData: {filename}")
+        data = self._sdFileListCache.get(filename.lower())
         if isinstance(data, str):
-            data = files.get(data.lower())
+            data = self._sdFileListCache.get(data.lower())
+        self._logger.debug(f"_getSdFileData: {data}")
         return data
 
     def _getSdFiles(self) -> List[Dict[str, Any]]:
-        files = self._mappedSdList()
-        return [x for x in files.values() if isinstance(x, dict)]
+        self._sdFileListCache = self._mappedSdList()
+        self._logger.debug(f"_getSdFiles return: {self._sdFileListCache}")
+        return [x for x in self._sdFileListCache.values() if isinstance(x, dict)]
 
     def _selectSdFile(self, filename: str, check_already_open: bool = False) -> None:
+        self._logger.debug(f"_selectSdFile: {filename}, check_already_open={check_already_open}")
         if filename.startswith("/"):
             filename = filename[1:]
 
         file = self._getSdFileData(filename)
         if file is None:
-            self._send(f"{filename} open failed")
-            return
+            self._listSd(incl_long=True, incl_timestamp=True)
+            self._sendOk()
+            file = self._getSdFileData(filename)
+            if file is None:
+                self._send(f"{filename} open failed")
+                return
 
         if self._selectedSdFile == file["path"] and check_already_open:
             return
@@ -677,9 +765,11 @@ class BambuPrinter:
         self._send("File selected")
 
     def _startSdPrint(self, from_printer: bool = False) -> None:
+        self._logger.debug(f"_startSdPrint: from_printer={from_printer}")
         if self._selectedSdFile is not None:
             if self._sdPrinter is None:
                 self._sdPrinting = True
+                self._sdPrintStarting = True
                 self._sdPrinter = threading.Thread(target=self._sdPrintingWorker, kwargs={"from_printer": from_printer})
                 self._sdPrinter.start()
         # self._sdPrintingSemaphore.set()
@@ -699,18 +789,21 @@ class BambuPrinter:
             else:
                 self._logger.info("print pause failed")
 
-    def _cancelSdPrint(self):
+    def _cancelSdPrint(self) -> bool:
         if self.bambu.connected:
             if self.bambu.publish(commands.STOP):
                 self._logger.info("print cancelled")
+                self._finishSdPrint()
+                return True
             else:
                 self._logger.info("print cancel failed")
+                return False
 
     def _setSdPos(self, pos):
         self._newSdFilePos = pos
 
     def _reportSdStatus(self):
-        if self._sdPrinter is not None and (self._sdPrintingSemaphore.is_set() or self._sdPrintingPausedSemaphore.is_set()):
+        if ( self._sdPrinter is not None or self._sdPrintStarting is True ) and self._selectedSdFileSize > 0:
             self._send(f"SD printing byte {self._selectedSdFilePos}/{self._selectedSdFileSize}")
         else:
             self._send("Not SD printing")
@@ -732,10 +825,14 @@ class BambuPrinter:
         output += " @:64\n"
         return output
 
-    def _processTemperatureQuery(self):
+    def _processTemperatureQuery(self) -> bool:
         # includeOk = not self._okBeforeCommandOutput
-        output = self._generateTemperatureOutput()
-        self._send(output)
+        if self.bambu.connected:
+            output = self._generateTemperatureOutput()
+            self._send(output)
+            return True
+        else:
+            return False
 
     def _writeSdFile(self, filename: str) -> None:
         self._send(f"Writing to file: {filename}")
@@ -764,7 +861,13 @@ class BambuPrinter:
                 print_command = {"print": {"sequence_id": 0,
                                            "command": "project_file",
                                            "param": "Metadata/plate_1.gcode",
+                                           "md5": "",
+                                           "profile_id": "0",
+                                           "project_id": "0",
+                                           "subtask_id": "0",
+                                           "task_id": "0",
                                            "subtask_name": f"{self._selectedSdFile}",
+                                           "file": f"{self._selectedSdFile}",
                                            "url": f"file:///mnt/sdcard/{self._selectedSdFile}" if self._settings.get_boolean(["device_type"]) in ["X1", "X1C"] else f"file:///sdcard/{self._selectedSdFile}",
                                            "timelapse": self._settings.get_boolean(["timelapse"]),
                                            "bed_leveling": self._settings.get_boolean(["bed_leveling"]),
@@ -799,6 +902,7 @@ class BambuPrinter:
             self._selectedSdFilePos = 0
             self._selectedSdFileSize = 0
             self._sdPrinting = False
+            self._sdPrintStarting = False
             self._sdPrinter = None
 
     def _deleteSdFile(self, filename: str) -> None:
@@ -811,7 +915,7 @@ class BambuPrinter:
         if file is not None:
             ftp = IoTFTPSClient(f"{host}", 990, "bblp", f"{access_code}", ssl_implicit=True)
             try:
-                if ftp.delete_file(filename):
+                if ftp.delete_file(file["path"]):
                     self._logger.debug(f"{filename} deleted")
                 else:
                     raise Exception("delete failed")

setup.py

@@ -14,7 +14,7 @@ plugin_package = "octoprint_bambu_printer"
 plugin_name = "OctoPrint-BambuPrinter"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.0.5"
+plugin_version = "0.0.23"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module
@@ -33,7 +33,7 @@ plugin_url = "https://github.com/jneilliii/OctoPrint-BambuPrinter"
 plugin_license = "AGPLv3"
 
 # Any additional requirements besides OctoPrint should be listed here
-plugin_requires = ["paho-mqtt", "python-dateutil", "pybambu>=1.0.1"]
+plugin_requires = ["paho-mqtt<2", "python-dateutil", "pybambu>=1.0.1"]
 
 ### --------------------------------------------------------------------------------------------------------------------
 ### More advanced options that you usually shouldn't have to touch follow after this point