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

console logging macros file

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-23 04:32:12 +05:30
parent 0a4213560d
commit c903552770
2 changed files with 14 additions and 3 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() {
macrosList=this.config.macros.map(item=>item.gcode_file_name).toString(); const macrosList=this.config.macros.map(item=>item.gcode_file_name).toString();
api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`); api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`);
this.deleteGCode = false; this.deleteGCode = false;
}, },

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

@@ -38,8 +38,19 @@ class FileHandler(bbctrl.APIHandler):
def delete_ok(self, filename): def delete_ok(self, filename):
allFiles = self.get_ctrl().state.return_files() allFiles = self.get_ctrl().state.return_files()
if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
macrosList=filename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
self.get_log('FileHandler').info('macrosList ' + macrosList)
# filename = os.path.basename(filename)
# self.get_log('FileHandler').info('filenamed ' + filename)
# self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename))
# safe_remove(self.get_upload(filename))
# self.get_ctrl().preplanner.delete_plans(filename)
# self.get_ctrl().state.remove_file(filename)
if not filename: elif not filename:
# Delete everything # Delete everything
for path in glob.glob(self.get_upload('*')): for path in glob.glob(self.get_upload('*')):
self.get_log('FileHandler').info('path ' + path) self.get_log('FileHandler').info('path ' + path)
@@ -50,7 +61,7 @@ class FileHandler(bbctrl.APIHandler):
else: else:
# Delete a single file # Delete a single file
filename = os.path.basename(filename) filename = os.path.basename(filename)
self.get_log('FileHandler').info('filename ' + filename) self.get_log('FileHandler').info('filenamed ' + filename)
self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename)) self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename))
safe_remove(self.get_upload(filename)) safe_remove(self.get_upload(filename))
self.get_ctrl().preplanner.delete_plans(filename) self.get_ctrl().preplanner.delete_plans(filename)