From b53524b83d521af9368e793fe9eb9d0ef34ac5e8 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Mon, 22 Jan 2024 16:22:06 +0530
Subject: [PATCH] adding to macrosList, testing gcodelist

---
 src/js/control-view.js | 15 ++++++++----
 src/js/macros.js       | 55 +++++++++++++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/js/control-view.js b/src/js/control-view.js
index 7b88929..63f15e2 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -201,6 +201,11 @@ module.exports = {
 
             const p = this.plan_time / this.toolpath.time;
             return Math.min(1, p);
+        },
+        gcode_files: async function (){
+            const files=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item));
+            console.log(files);
+            return files;
         }
     },
 
@@ -513,9 +518,9 @@ module.exports = {
                 console.warn("Error running program: ",error);
             }
         },
-        gcode_files: async function (){
-            const files=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item));
-            console.log(files);
+        // gcode_files: async function (){
+        //     const files=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item));
+        //     console.log(files);
             // this.config.gcodeList=files;
             // try {
             //     await api.put("config/save", this.config);
@@ -525,8 +530,8 @@ module.exports = {
             //     console.error("Restore Failed: ", error);
             //     alert("Restore failed");
             //   }
-            return files;
-        }
+        //     return files;
+        // }
     },
 
     mixins: [ require("./axis-vars") ]
diff --git a/src/js/macros.js b/src/js/macros.js
index 8f9d790..a6423e5 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -42,12 +42,12 @@ module.exports = {
     updateNewGcode: function (event) {
       this.newGcode[this.tab - 1] = event.target.value;
     },
-    loadGcode: function (data){
+    loadGcode: function (data) {
       this.newGcode[this.tab - 1] = data;
     },
-    macrosList: function (){
+    macrosList: function () {
       return this.config.macrosList.map((el) => el.gcode_file_name);
-    }
+    },
   },
   methods: {
     open: function () {
@@ -70,7 +70,7 @@ module.exports = {
       }
       console.log(this.newGcode[this.tab - 1]);
     },
-    upload: function (e) {
+    upload:async function (e) {
       const files = e.target.files || e.dataTransfer.files;
       if (!files.length) {
         return;
@@ -90,12 +90,28 @@ module.exports = {
           return;
       }
 
-      
+      const gcodeData = {
+        gcode_file_name: file.name,
+        gcode_file_time: this.state.selected_time,
+      };
+      if(!this.config.macrosList.some(item=> item['gcode_file_name'] == file.name)){
+        console.log('new gcode file');
+        this.config.macrosList.push(gcodeData);
+        try {
+          await api.put("config/save", this.config);
+          this.$dispatch("update");
+        } catch (error) {
+          console.error("Restore Failed: ", error);
+          alert("Restore failed");
+        }
+      }else{
+        console.log('Already exists');
+      }
+
       SvelteComponents.showDialog("Upload", {
         file,
         onComplete: () => {
           this.last_file_time = undefined; // Force reload
-
         },
       });
     },
@@ -124,14 +140,19 @@ module.exports = {
       xhr.open("PUT", `/api/file/${encodeURIComponent(filename)}`, true);
       xhr.send(file);
 
-      // this.config.macrosList.push()
-      // try {
-      //   await api.put("config/save", this.config);
-      //   this.$dispatch("update");
-      // } catch (error) {
-      //   console.error("Restore Failed: ", error);
-      //   alert("Restore failed");
-      // }
+      const gcodeData = {
+        gcode_file_name: filename,
+        gcode_file_time: this.state.selected_time,
+      };
+
+      this.config.macrosList.push(gcodeData);
+      try {
+        await api.put("config/save", this.config);
+        this.$dispatch("update");
+      } catch (error) {
+        console.error("Restore Failed: ", error);
+        alert("Restore failed");
+      }
     },
     saveMacros: async function () {
       var macrosName = document.getElementById(
@@ -146,16 +167,16 @@ module.exports = {
 
       if (this.state.selected == "default") {
         var file = this.newGcode[this.tab - 1];
-        this.uploadGCode(macrosName, file,);
+        this.uploadGCode(macrosName, file);
       }
 
       this.config.macros[this.tab - 1].name = macrosName;
       this.config.macros[this.tab - 1].color = macrosColor;
       this.config.macros[this.tab - 1].gcode_file_name =
-        this.state.selected == "default" ? macrosName : this.state.selected;
+        this.state.selected == "default" ? macrosName+'.ngc' : this.state.selected;
       this.config.macros[this.tab - 1].gcode_file_time =
         this.state.selected_time;
-      this.cancelMacros(this.tab - 1);
+      console.log(this.config.macros[this.tab - 1].gcode_file_name);
       this.confirmSave = false;
       try {
         await api.put("config/save", this.config);