muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deleting except macros

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-23 04:44:21 +05:30
parent c903552770
commit 82bb6cdc47
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/control-view.js
View File

@@ -420,7 +420,7 @@ module.exports = {
}, },
delete_all_except_macros: function() { delete_all_except_macros: function() {
const macrosList=this.config.macros.map(item=>item.gcode_file_name).toString(); const macrosList=this.config.macrosList.map(item=>item.gcode_file_name).toString();
api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`); api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`);
this.deleteGCode = false; this.deleteGCode = false;
}, },

17
src/py/bbctrl/FileHandler.py
View File

@@ -40,15 +40,16 @@ class FileHandler(bbctrl.APIHandler):
allFiles = self.get_ctrl().state.return_files() allFiles = self.get_ctrl().state.return_files()
if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'): if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
macrosList=filename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','') macrosList=filename.replace('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
self.get_log('FileHandler').info('macrosList ' + macrosList) self.get_log('FileHandler').info('macrosList ' + macrosList).split(',')
# filename = os.path.basename(filename) for filename in [item for item in allFiles if item not in macrosList]:
# self.get_log('FileHandler').info('filenamed ' + filename) filename = os.path.basename(filename)
# self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename)) self.get_log('FileHandler').info('filenamed ' + filename)
# safe_remove(self.get_upload(filename)) self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename))
# self.get_ctrl().preplanner.delete_plans(filename) safe_remove(self.get_upload(filename))
# self.get_ctrl().state.remove_file(filename) self.get_ctrl().preplanner.delete_plans(filename)
self.get_ctrl().state.remove_file(filename)
elif not filename: elif not filename:
# Delete everything # Delete everything