From 526f07a746d99e4bb9a65289a89bc466f2d73542 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Fri, 5 Apr 2024 01:34:47 +0530 Subject: [PATCH] using promises --- src/js/control-view.js | 87 +++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/src/js/control-view.js b/src/js/control-view.js index 1e53159..818e0da 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -502,6 +502,17 @@ module.exports = { this.folder_name = ""; }, + readFile: function (file) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.onload = () => { + resolve(reader.result); + }; + reader.onerror = reject; + reader.readAsText(file); + }); + }, + upload_folder: async function (e) { const files = e.target.files || e.dataTransfer.files; console.log(files); @@ -518,44 +529,50 @@ module.exports = { this.showFileDuplicate = true; return; } - const gcode = await file.text(); - const extension = file.name.split(".").pop(); - switch (extension.toLowerCase()) { - case "nc": - case "ngc": - case "gcode": - case "gc": - break; - - default: - alert(`Unsupported file type: ${extension}`); - return; - } - - await this.upload_gcode(file.name, gcode); - - const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name); - if (!isAlreadyPresent) { - this.config.non_macros_list.push({ file_name: file.name }); - } - - const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName); - if (folder) { - folder.files.push({ file_name: file.name }); - } else { - this.config.gcode_list.push({ - name: folderName, - type: "folder", - files: [ - { - file_name: file.name, - }, - ], - }); + try { + const fileContent = await readFile(file); + console.log(fileContent); + } catch (error) { + alert('Error reading file:', error); } } + // const extension = file.name.split(".").pop(); + // switch (extension.toLowerCase()) { + // case "nc": + // case "ngc": + // case "gcode": + // case "gc": + // break; - this.save_config(this.config); + // default: + // alert(`Unsupported file type: ${extension}`); + // return; + // } + + // await this.upload_gcode(file.name, gcode); + + // const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name); + // if (!isAlreadyPresent) { + // this.config.non_macros_list.push({ file_name: file.name }); + // } + + // const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName); + // if (folder) { + // folder.files.push({ file_name: file.name }); + // } else { + // this.config.gcode_list.push({ + // name: folderName, + // type: "folder", + // files: [ + // { + // file_name: file.name, + // }, + // ], + // }); + // } + // } + + // this.save_config(this.config); }, delete_current: async function () {