diff --git a/src/js/control-view.js b/src/js/control-view.js index 11827f4..a21eff7 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -523,6 +523,8 @@ module.exports = { } }, gcode_files: function (){ + console.log(this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item))); + console.log(this.state.gcodeList); return this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item)) } }, diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py index b8de974..4ddd08c 100644 --- a/src/py/bbctrl/FileHandler.py +++ b/src/py/bbctrl/FileHandler.py @@ -37,9 +37,11 @@ class FileHandler(bbctrl.APIHandler): self.uploadFile.write(data) def delete_ok(self, filename): + self.get_log('FileHandler').info('filename ' + filename) if not filename: # Delete everything for path in glob.glob(self.get_upload('*')): + self.get_log('FileHandler').info('path ' + path) safe_remove(path) self.get_ctrl().preplanner.delete_all_plans() self.get_ctrl().state.clear_files() @@ -47,6 +49,7 @@ class FileHandler(bbctrl.APIHandler): else: # Delete a single file filename = os.path.basename(filename) + self.get_log('FileHandler').info('filename ' + filename) safe_remove(self.get_upload(filename)) self.get_ctrl().preplanner.delete_plans(filename) self.get_ctrl().state.remove_file(filename)