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

delete folder

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-28 17:14:54 +05:30
parent 3f0bf4090a
commit 751d9df698
2 changed files with 91 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ module.exports = {
ask_home: true,
folder_name: "",
edited: false,
confirmDelete: false,
create_folder: false,
showGcodeMessage: false,
showNoGcodeMessage: false,
@@ -451,13 +452,12 @@ module.exports = {
fileArray.shift();
const newFileList = new DataTransfer().files;
fileArray.forEach(file => newFileList.add(file));
fileArray.forEach(file => newFileList.push(file));
return newFileList;
},
create_new_folder: async function () {
console.log(this.folder_name);
if (
this.folder_name.trim() != "" &&
!this.config.gcode_list.find(item => item.type == "folder" && item.name == this.folder_name)
@@ -468,6 +468,8 @@ module.exports = {
files: [],
});
this.edited = false;
this.create_folder = false;
this.folder_name = "";
try {
await api.put("config/save", this.config);
this.state.folder = this.folder_name;
@@ -589,6 +591,62 @@ module.exports = {
this.deleteGCode = false;
},
delete_folder: async function () {
if (!this.state.folder) {
const files_to_move = this.config.gcode_list.find(
item => item.type == "folder" && item.name == this.state.folder,
);
if (!files_to_move) {
files_to_move.files.forEach(item => {
this.config.gcode_list.push({
name: item.file_name,
type: "file",
files: [],
});
});
this.config.gcode_list = this.config.gcode_list.filter(item => {
if (item.type == "folder" && item.name == this.state.folder) {
return false;
}
return true;
});
try {
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
}
}
this.confirmDelete = false;
},
delete_folder_and_files: async function () {
if (!this.state.folder) {
const selected_folder = this.config.gcode_list.find(
item => (item.type = "folder" && item.name == this.state.folder),
);
if (!selected_folder) {
const files_to_delete = selected_folder.files.map(item => item.file_name).toString();
api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${files_to_delete}`);
this.config.gcode_list = this.config.gcode_list.filter(item => {
if (item.type == "folder" && item.name == this.state.folder) {
return false;
}
return true;
});
try {
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
}
}
this.confirmDelete = false;
},
home: function (axis) {
this.ask_home = false;

51
src/pug/templates/control-view.pug
View File

@@ -271,21 +271,21 @@ script#control-view-template(type="text/x-template")
v-if="false", style="height:100px;width:100px;font-weight:normal")
.fa.fa-step-forward
//- button.pure-button(title="Upload a new GCode program.", @click="open_file",
//- :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
//- .fa.fa-folder-open
form.gcode-file-input.file-upload
input(type="file", @change="upload_file", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc")
//- button.pure-button(title="Upload a new GCode folder.", @click="open_folder",
//- :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
//- .fa.fa-folder
button.pure-button(title="Upload a new GCode folder.", @click="open_folder",
:disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
.fa.fa-folder
form.gcode-folder-input.file-upload
input#folderInput(type="file", @change="upload_folder", :disabled="!is_ready",
webkitdirectory, directory, multiple)
button.pure-button(title="Upload a new GCode program.", @click="open_file",
:disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
.fa.fa-folder-open
form.gcode-file-input.file-upload
input(type="file", @change="upload_file", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc")
a(:disabled="!state.selected", download,
:href="'/api/file/' + state.selected",
@@ -314,7 +314,7 @@ script#control-view-template(type="text/x-template")
message(:show.sync="create_folder")
h3(slot="header") Enter folder name:
div(slot="body")
input.input-name(type="text",minlength='1',maxlength='15',
input.input-name(type="text",minlength='1',maxlength='15',style ="margin-top:1rem;margin-bottom:2rem;",
id="folder-name" ,v-model="folder_name",@keypress="edited_folder_name")
div(slot="footer")
@@ -330,23 +330,34 @@ script#control-view-template(type="text/x-template")
button.pure-button(title="Create a new folder.", @click="create_folder=true",
:disabled="!is_ready")
.fa.fa-plus
| Create Folder
message(:show.sync="confirmDelete")
h3(slot="header") Delete Folder?
div(slot="body")
p Are you sure to delete the folder?
div(slot="footer")
button.pure-button(@click="confirmDelete=false") Cancel
button.pure-button.pure-button-primary(@click="delete_folder") Folder only
button.pure-button.pure-button-primary(@click="delete_folder_and_files") Folder and files
button.pure-button(title="Upload a new folder.", @click="open_folder",
button.pure-button(title="Delete a folder.", @click="create_folder=true",
:disabled="!is_ready")
.fa.fa-plus
| Upload Folder
| Delete Folder
//- button.pure-button(title="Upload a new folder.", @click="open_folder",
//- :disabled="!is_ready")
//- | Upload Folder
select(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready",
style="max-width:100%")
option(v-for="file in gcode_files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open_file",
:disabled="!is_ready")
.fa.fa-plus
| Upload File
//- button.pure-button(title="Upload a new GCode program.", @click="open_file",
//- :disabled="!is_ready")
//- | Upload File
.progress(v-if="toolpath_progress && toolpath_progress < 1",
title="Simulating GCode to check for errors, calculate ETA and " +