muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

promises fix

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-27 19:47:47 +05:30
parent f470278840
commit 10472dbe58
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/js/control-view.js
View File

@@ -208,7 +208,7 @@ module.exports = {
if (!this.state.folder || this.state.folder == "") { if (!this.state.folder || this.state.folder == "") {
return files; return files;
} }
if (this.state.folder == "unorganized files") { if (this.state.folder == "Unorganized files") {
files = this.config.gcode_list.map(item => { files = this.config.gcode_list.map(item => {
if (item.type == "file") { if (item.type == "file") {
return item.name; return item.name;
@@ -217,16 +217,10 @@ module.exports = {
return files; return files;
} }
files = this.config.gcode_list.find(item => item.name == this.state.folder).files.map(item => item.file_name); files = this.config.gcode_list.find(item => item.name == this.state.folder).files.map(item => item.file_name);
// const filesWithNoMacros = this.state.files.filter(
// item => !this.config.macros_list.some(compareItem => compareItem.file_name == item),
// );
// const gcodeList = this.config.non_macros_list.map(item => item.file_name);
// const unionSet = new Set([...filesWithNoMacros, ...gcodeList]);
// const files = [...unionSet].sort();
return files; return files;
}, },
gcode_folders: function () { gcode_folders: function () {
let folders = ["unorganized files"]; let folders = ["Unorganized files"];
for (let item of this.config.gcode_list) { for (let item of this.config.gcode_list) {
if (item.type == "folder") { if (item.type == "folder") {
folders.push(item.name); folders.push(item.name);
@@ -435,6 +429,7 @@ module.exports = {
} }
const folderName = files[0].webkitRelativePath.split("/")[0]; const folderName = files[0].webkitRelativePath.split("/")[0];
console.log(files); console.log(files);
const upload_files = [];
for (let file of files) { for (let file of files) {
console.log(file.name); console.log(file.name);
const extension = file.name.split(".").pop(); const extension = file.name.split(".").pop();
@@ -454,13 +449,19 @@ module.exports = {
if (isAlreadyPresent == undefined) { if (isAlreadyPresent == undefined) {
this.config.non_macros_list.push({ file_name: file.name }); this.config.non_macros_list.push({ file_name: file.name });
} }
await SvelteComponents.showDialog("Upload", { const uploadPromise = new Promise((resolve, reject) => {
file, SvelteComponents.showDialog("Upload", {
onComplete: () => { file,
this.last_file_time = undefined; // Force reload onComplete: () => {
this.$broadcast("gcode-reload", file.name); this.last_file_time = undefined; // Force reload
}, this.$broadcast("gcode-reload", file.name);
resolve();
},
});
}); });
upload_files.push(uploadPromise);
const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName); const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName);
if (folder) { if (folder) {
folder.files.push({ file_name: file.name }); folder.files.push({ file_name: file.name });
@@ -476,6 +477,10 @@ module.exports = {
}); });
} }
} }
const response = await Promise.allSettled(upload_files);
console.log(response);
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);
this.$dispatch("update"); this.$dispatch("update");
@@ -517,6 +522,7 @@ module.exports = {
const macrosList = this.config.macros_list.map(item => item.file_name).toString(); const macrosList = this.config.macros_list.map(item => item.file_name).toString();
api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`); api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`);
this.config.non_macros_list = []; this.config.non_macros_list = [];
this.state.folder = "";
this.config.gcode_list = []; this.config.gcode_list = [];
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);