From 72fc59ee041c18a24d403a6783696dc2657c9b93 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Fri, 29 Mar 2024 03:05:37 +0530
Subject: [PATCH] preventing to upload file with same name

---
 src/js/control-view.js             | 9 +++++++++
 src/js/gcode-viewer.js             | 3 ---
 src/pug/templates/control-view.pug | 8 ++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/js/control-view.js b/src/js/control-view.js
index d0ec224..31e77f4 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -48,6 +48,7 @@ module.exports = {
       showGcodeMessage: false,
       showNoGcodeMessage: false,
       macrosLoading: false,
+      showFileDuplicate: false,
       show_gcodes: false,
     };
   },
@@ -404,6 +405,10 @@ module.exports = {
       }
 
       const file = files[0];
+      if (this.state.files.includes(file.name)) {
+        this.showFileDuplicate = true;
+        return;
+      }
       const extension = file.name.split(".").pop();
       switch (extension.toLowerCase()) {
         case "nc":
@@ -506,6 +511,10 @@ module.exports = {
 
       for (let file of files) {
         console.log(file.name);
+        if (this.state.files.includes(file.name)) {
+          this.showFileDuplicate = true;
+          return;
+        }
         const gcode = await file.text();
         const extension = file.name.split(".").pop();
         switch (extension.toLowerCase()) {
diff --git a/src/js/gcode-viewer.js b/src/js/gcode-viewer.js
index 6f2a004..ad8936b 100644
--- a/src/js/gcode-viewer.js
+++ b/src/js/gcode-viewer.js
@@ -72,9 +72,6 @@ module.exports = {
       }
 
       const response = await fetch(`/api/file/${file}`, { cache: "no-cache" });
-      if (response.status == 400) {
-        return;
-      }
       const text = await response.text();
 
       if (text.length > 20e6) {
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 0d7bb4e..3088058 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -270,6 +270,14 @@ script#control-view-template(type="text/x-template")
             :disabled="(!is_ready && !is_holding) || !state.selected",
             v-if="false", style="height:100px;width:100px;font-weight:normal")
             .fa.fa-step-forward
+
+          message(:show.sync="showFileDuplicate")
+              h3(slot="header") G-Code file with the same name already exists
+              div(slot="body")
+                p Please rename the file and try again.
+
+              div(slot="footer")
+                button.pure-button(@click="showFileDuplicate=false") OK
           
           button.pure-button(title="Upload a new GCode folder.", @click="open_folder",
             :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")