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

union of gcode list, updating while upload

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-22 17:20:47 +05:30
parent e326ffa4c0
commit 2ccbd2510c
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,9 +203,9 @@ module.exports = {
return Math.min(1, p); return Math.min(1, p);
}, },
gcodeFiles: function () { gcodeFiles: function () {
console.log(this.state.files); const filesWithNoMacros=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item));
console.log(this.config.macrosList); const unionSet = new Set([...filesWithNoMacros, ...this.config.gcodeList]);
const files=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item)); const files = [...unionSet];
console.log(files); console.log(files);
return files; return files;
} }
@@ -353,7 +353,7 @@ module.exports = {
utils.clickFileInput("gcode-file-input"); utils.clickFileInput("gcode-file-input");
}, },
upload: function(e) { upload: async function(e) {
const files = e.target.files || e.dataTransfer.files; const files = e.target.files || e.dataTransfer.files;
if (!files.length) { if (!files.length) {
return; return;
@@ -373,7 +373,21 @@ module.exports = {
return; return;
} }
if(this.config.macrosList.some(obj => obj.gcode_file_name == files.name)){ if(!this.config.gcodeList.some(item=> item == file.name)){
console.log('new gcode file');
this.config.gcodeList.push(file.name);
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');
}
if(this.config.macrosList.some(obj => obj.gcode_file_name == file.name)){
console.log("It is a macros, remove it from macrosList") console.log("It is a macros, remove it from macrosList")
// this.config.gcodeList.push(file.name); // this.config.gcodeList.push(file.name);
} }