From 6205e58cd9be965f66b21d5aad46e1dab3645a9a Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Fri, 29 Mar 2024 02:01:36 +0530
Subject: [PATCH] fixing promise and delete

---
 src/js/control-view.js       | 8 ++++----
 src/py/bbctrl/FileHandler.py | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/js/control-view.js b/src/js/control-view.js
index 150ba0c..29fd2cd 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -499,7 +499,7 @@ module.exports = {
 
       for (let file of files) {
         console.log(file.name);
-        const gcode = file.text();
+        const gcode = await file.text();
         const extension = file.name.split(".").pop();
         switch (extension.toLowerCase()) {
           case "nc":
@@ -628,7 +628,7 @@ module.exports = {
           if (selected_folder) {
             const files_to_delete = selected_folder.files.map(item => item.file_name).toString();
             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 => {
               if (item.type == "folder" && item.name == this.state.folder) {
                 return false;
@@ -638,11 +638,11 @@ module.exports = {
             console.log(this.config.gcode_list);
           }
         } 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) {
             const files_to_delete = selected_folder.map(item => item.name).toString();
             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");
           }
         }
diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py
index 0822eec..adbd4c4 100644
--- a/src/py/bbctrl/FileHandler.py
+++ b/src/py/bbctrl/FileHandler.py
@@ -46,8 +46,6 @@ class FileHandler(bbctrl.APIHandler):
 
             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))
                 safe_remove(self.get_upload(filename))
                 self.get_ctrl().preplanner.delete_plans(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]:
                 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)