uploading zip

src/js/admin-general-view.js

@@ -11,7 +11,7 @@ const variant_defaults = {
   woodworker_x35: require("../resources/onefinity_woodworker_x35_defaults.json"),
   woodworker_x50: require("../resources/onefinity_woodworker_x50_defaults.json"),
   journeyman_x50: require("../resources/onefinity_journeyman_x50_defaults.json"),
-    foreman_pro: require('../resources/onefinity_foreman_pro_defaults.json')
+  foreman_pro: require("../resources/onefinity_foreman_pro_defaults.json"),
 };
 
 const z_slider_defaults = {
@@ -38,7 +38,7 @@ module.exports = {
       reset_variant: "",
       z_slider: false,
       z_slider_variant: " ",
-          config:""
+      config: "",
     };
   },
 
@@ -48,20 +48,31 @@ module.exports = {
 
   methods: {
     backup: function () {
-            document.getElementById("download-target").src = "/api/config/download/"+ this.state.macros_list.map(item => item.file_name).join(",");
+      document.getElementById("download-target").src =
+        "/api/config/download/" + this.state.macros_list.map(item => item.file_name).join(",");
     },
 
     restore_config: function () {
       utils.clickFileInput("restore-config");
     },
 
-        restore: function(e) {
+    restore: async function (e) {
       const files = e.target.files || e.dataTransfer.files;
       if (!files.length) {
         return;
       }
       
-            console.log(files);
+      try {
+        await api.put("/api/config/restore", files[0]);
+        SvelteComponents.showDialog("Message", {
+          title: "Success",
+          message: "Configuration restored",
+        });
+        this.confirmReset = false;
+      } catch (error) {
+        console.error("Restore Failed: ", error);
+        alert("Restore failed");
+      }
 
       // const fileReader = new FileReader();
       // fileReader.onload = async ({ target }) => {
@@ -92,17 +103,13 @@ module.exports = {
     },
 
     next: async function () {
-            const config = merge(
+      const config = merge({}, config_defaults, variant_defaults[this.reset_variant]);
-                {},
-                config_defaults,
-                variant_defaults[this.reset_variant]
-                );
 
       try {
         await api.put("config/save", config);
         this.confirmReset = false;
         this.$dispatch("update");
-                    this.config= config
+        this.config = config;
         this.z_slider = true;
       } catch (error) {
         console.error("Restore failed:", error);
@@ -111,11 +118,7 @@ module.exports = {
     },
 
     set_z_slider: async function () {
-                 const z_variant = merge(
+      const z_variant = merge({}, this.config.motors[3], z_slider_defaults[this.z_slider_variant]);
-                   {},
-                   this.config.motors[3],
-                   z_slider_defaults[this.z_slider_variant],
-                 );
 
       this.config.motors[3] = z_variant;
       try {
@@ -154,6 +157,6 @@ module.exports = {
     change_auto_check_upgrade: function () {
       this.config.admin["auto-check-upgrade"] = this.autoCheckUpgrade;
       this.$dispatch("config-changed");
-        }
+    },
-    }
+  },
 };

src/py/bbctrl/Web.py

@@ -293,6 +293,30 @@ class ConfigDownloadHandler(bbctrl.APIHandler):
       self.write(buffer.getvalue())
       self.finish()
 
+class ConfigRestoreHandler(bbctrl.APIHandler):
+    def put(self):
+        zip_file = self.request.files['file'][0]
+        if not os.path.exists('./config-temp'):
+            os.mkdir('./config-temp')
+        
+        if not os.path.exists(self.get_upload()):
+            os.mkdir(self.get_upload())
+
+        zip_path = os.path.join("./temp", zip_file['filename'])
+        print(zip_path)
+        # with open(zip_path, 'wb') as f:
+        #     f.write(zip_file['body'])
+        
+        # with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+        #     zip_ref.extractall("./temp")
+        
+        # for root, dirs, files in os.walk("./temp"):
+        #     for files in files:
+
+        
+        self.write("File processed successfully.")
+        self.finish()
+
 
 class ConfigSaveHandler(bbctrl.APIHandler):
     def put_ok(self): self.get_ctrl().config.save(self.json)
@@ -640,31 +664,6 @@ class StaticFileHandler(tornado.web.StaticFileHandler):
         self.set_header('Cache-Control',
                         'no-store, no-cache, must-revalidate, max-age=0')
 
-class MacrosUploadHandler(bbctrl.APIHandler):
-    def post(self):
-        zip_file = self.request.files['file'][0]
-
-        if not os.path.exists('./config-temp'):
-            os.mkdir('./config-temp')
-        
-        if not os.path.exists(self.get_upload()):
-            os.mkdir(self.get_upload())
-
-        # zip_path = os.path.join("./temp", zip_file['filename'])
-        # with open(zip_path, 'wb') as f:
-        #     f.write(zip_file['body'])
-        
-        # with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-        #     zip_ref.extractall("./temp")
-        
-        # for root, dirs, files in os.walk("./temp"):
-        #     for files in files:
-
-        
-        self.write("File processed successfully.")
-        self.finish()
-
-
 class Web(tornado.web.Application):
     def __init__(self, args, ioloop):
         self.args = args
@@ -699,10 +698,10 @@ class Web(tornado.web.Application):
             (r'/api/config/download(/[^/]+)?', ConfigDownloadHandler),
             (r'/api/config/save', ConfigSaveHandler),
             (r'/api/config/reset', ConfigResetHandler),
+            (r'/api/config/restore',ConfigRestoreHandler),
             (r'/api/firmware/update', FirmwareUpdateHandler),
             (r'/api/upgrade', UpgradeHandler),
             (r'/api/file(/[^/]+)?', bbctrl.FileHandler),
-            (r'/api/macros/upload',MacrosUploadHandler),
             (r'/api/path/([^/]+)((/positions)|(/speeds))?', PathHandler),
             (r'/api/home(/[xyzabcXYZABC]((/set)|(/clear))?)?', HomeHandler),
             (r'/api/start', StartHandler),