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

updating state while deleting GCodes, delete GCodes option for macros , added prettier,

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-23 11:07:50 +05:30
parent 62635afea3
commit 4fe0b90fff
6 changed files with 133 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,18 +40,32 @@ class FileHandler(bbctrl.APIHandler):
allFiles = self.get_ctrl().state.return_files()
if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
macrosList=filename.replace('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','').split(',')
for i in macrosList:
exceptionList=filename.replace('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','').split(',')
for i in exceptionList:
self.get_log('FileHandler').info('macrosListItem ' + i)
for filename in [item for item in allFiles if item not in macrosList]:
for filename in [item for item in allFiles if item not in exceptionList]:
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))
# 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)
elif filename.startswith('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH'):
deletionList=filename.replace('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH','').split(',')
for i in deletionList:
self.get_log('FileHandler').info('macrosListItem ' + i)
for filename in [item for item in allFiles if item in deletionList]:
filename = os.path.basename(filename)
self.get_log('FileHandler').info('filename deleted as Macros ' + 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)
elif not filename:
# Delete everything
for path in glob.glob(self.get_upload('*')):
@@ -63,8 +77,8 @@ class FileHandler(bbctrl.APIHandler):
else:
# Delete a single file
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))
# 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)