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

fixing promise and delete

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-29 02:01:36 +05:30
parent 5814cb34e4
commit 6205e58cd9
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -499,7 +499,7 @@ module.exports = {
for (let file of files) { for (let file of files) {
console.log(file.name); console.log(file.name);
const gcode = file.text(); const gcode = await file.text();
const extension = file.name.split(".").pop(); const extension = file.name.split(".").pop();
switch (extension.toLowerCase()) { switch (extension.toLowerCase()) {
case "nc": case "nc":
@@ -628,7 +628,7 @@ module.exports = {
if (selected_folder) { if (selected_folder) {
const files_to_delete = selected_folder.files.map(item => item.file_name).toString(); const files_to_delete = selected_folder.files.map(item => item.file_name).toString();
console.log(files_to_delete); console.log(files_to_delete);
await api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${files_to_delete}`); await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete}`);
this.config.gcode_list = this.config.gcode_list.filter(item => { this.config.gcode_list = this.config.gcode_list.filter(item => {
if (item.type == "folder" && item.name == this.state.folder) { if (item.type == "folder" && item.name == this.state.folder) {
return false; return false;
@@ -638,11 +638,11 @@ module.exports = {
console.log(this.config.gcode_list); console.log(this.config.gcode_list);
} }
} else { } else {
const selected_folder = this.config.gcode_list.find(item => item.type == "file"); const selected_folder = this.config.gcode_list.filter(item => item.type == "file");
if (selected_folder) { if (selected_folder) {
const files_to_delete = selected_folder.map(item => item.name).toString(); const files_to_delete = selected_folder.map(item => item.name).toString();
console.log(files_to_delete); console.log(files_to_delete);
await api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${files_to_delete}`); await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete}`);
this.config.gcode_list = this.config.gcode_list.filter(item => item.type != "file"); this.config.gcode_list = this.config.gcode_list.filter(item => item.type != "file");
} }
} }

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

@@ -46,8 +46,6 @@ class FileHandler(bbctrl.APIHandler):
for filename in [item for item in allFiles if item not in exceptionList]: for filename in [item for item in allFiles if item not in exceptionList]:
filename = os.path.basename(filename) 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)) safe_remove(self.get_upload(filename))
self.get_ctrl().preplanner.delete_plans(filename) self.get_ctrl().preplanner.delete_plans(filename)
self.get_ctrl().state.remove_file(filename) self.get_ctrl().state.remove_file(filename)
@@ -59,8 +57,6 @@ class FileHandler(bbctrl.APIHandler):
for filename in [item for item in allFiles if item in deletionList]: for filename in [item for item in allFiles if item in deletionList]:
filename = os.path.basename(filename) 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)) safe_remove(self.get_upload(filename))
self.get_ctrl().preplanner.delete_plans(filename) self.get_ctrl().preplanner.delete_plans(filename)
self.get_ctrl().state.remove_file(filename) self.get_ctrl().state.remove_file(filename)