0.0.14

fix cache file list issues
optimize file listing to only update when retrieving file list and not while selecting or deleting a file
don't remove intermediary file on local storage

octoprint_bambu_printer/__init__.py

@@ -10,11 +10,14 @@ from .ftpsclient import IoTFTPSClient
 
 
 class BambuPrintPlugin(
-    octoprint.plugin.SettingsPlugin, octoprint.plugin.TemplatePlugin
+    octoprint.plugin.SettingsPlugin, octoprint.plugin.TemplatePlugin, octoprint.plugin.AssetPlugin
 ):
 
+
+    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": False}] #, {"type": "generic", "custom_bindings": True, "template": "bambu_printer.jinja2"}]
 
     def get_settings_defaults(self):
         return {"device_type": "X1C",
@@ -31,7 +34,9 @@ class BambuPrintPlugin(
                 "local_mqtt": True,
                 "region": "",
                 "email": "",
-                "auth_token": ""}
+                "auth_token": "",
+                "always_use_default_options": False
+                }
 
     def support_3mf_files(self):
         return {'machinecode': {'3mf': ["3mf"]}}
@@ -50,7 +55,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:

octoprint_bambu_printer/static/js/bambu_printer.js

@@ -4,26 +4,74 @@
  * Author: jneilliii
  * License: AGPLv3
  */
+
 $(function() {
     function Bambu_printerViewModel(parameters) {
         var self = this;
 
-        // assign the injected parameters, e.g.:
+        self.settingsViewModel = parameters[0];
-        // self.loginStateViewModel = parameters[0];
+        self.filesViewModel = parameters[1];
-        // self.settingsViewModel = parameters[1];
 
-        // TODO: Implement your plugin's view model here.
+        /*$('#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" ],
         // Elements to bind to, e.g. #settings_plugin_bambu_printer, #tab_plugin_bambu_printer, ...
-        elements: [ /* ... */ ]
+        elements: [ "#bambu_printer_print_options" ]
     });
 });

octoprint_bambu_printer/templates/bambu_printer_settings.jinja2

@@ -27,7 +27,7 @@
 		</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>
@@ -37,4 +37,10 @@
             <label class="checkbox"><input type="checkbox" data-bind="checked: 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/virtual.py

@@ -71,6 +71,7 @@ class BambuPrinter:
         self._sdPrintStarting = False
         self._sdPrintingSemaphore = threading.Event()
         self._sdPrintingPausedSemaphore = threading.Event()
+        self._sdFileListCache = {}
         self._selectedSdFile = None
         self._selectedSdFileSize = 0
         self._selectedSdFilePos = 0
@@ -79,6 +80,7 @@ class BambuPrinter:
         self._busy_loop = None
 
 
+
         import logging
 
         self._logger = logging.getLogger(
@@ -172,8 +174,12 @@ class BambuPrinter:
                 self._sdPrintStarting = False
                 if not self._sdPrinting:
                     filename = print_job.get("subtask_name")
-                    if filename[-4:].lower() != ".3mf":
+                    if not self._sdFileListCache.get(filename.lower()):
-                        filename = print_job.get("gcode_file")
+                        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"
+
                     self._selectSdFile(filename)
                     self._startSdPrint(from_printer=True)
 
@@ -670,11 +676,11 @@ class BambuPrinter:
 
         for entry in filelistcache:
             if entry.startswith("/"):
-                filename = entry[1:]
+                filename = entry[1:].replace("cache/", "")
             else:
-                filename = entry
+                filename = entry.replace("cache/", "")
-            filesize = ftp.ftps_session.size("cache/"+entry)
+            filesize = ftp.ftps_session.size(entry)
-            date_str = ftp.ftps_session.sendcmd(f"MDTM cache/{entry}").replace("213 ", "")
+            date_str = ftp.ftps_session.sendcmd(f"MDTM {entry}").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 = {
@@ -690,15 +696,14 @@ class BambuPrinter:
         return result
 
     def _getSdFileData(self, filename: str) -> Optional[Dict[str, Any]]:
-        files = self._mappedSdList()
+        data = self._sdFileListCache.get(filename.lower())
-        data = files.get(filename.lower())
         if isinstance(data, str):
-            data = files.get(data.lower())
+            data = self._sdFileListCache.get(data.lower())
         return data
 
     def _getSdFiles(self) -> List[Dict[str, Any]]:
-        files = self._mappedSdList()
+        self._sdFileListCache = self._mappedSdList()
-        return [x for x in files.values() if isinstance(x, dict)]
+        return [x for x in self._sdFileListCache.values() if isinstance(x, dict)]
 
     def _selectSdFile(self, filename: str, check_already_open: bool = False) -> None:
         if filename.startswith("/"):

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.13"
+plugin_version = "0.0.14"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module