From 22ccab831b24e2746b6dd7a775225e59b9bf5e1e Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 5 Feb 2023 19:37:41 +0100 Subject: [PATCH] refactor: rename download zip name (#1252) --- src/components/panels/GcodefilesPanel.vue | 2 +- src/components/panels/Machine/ConfigFilesPanel.vue | 9 ++++++++- src/components/panels/Timelapse/TimelapseFilesPanel.vue | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue index a8daa17f3..f94333917 100644 --- a/src/components/panels/GcodefilesPanel.vue +++ b/src/components/panels/GcodefilesPanel.vue @@ -1161,7 +1161,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) { this.$socket.emit( 'server.files.zip', - { items, dest: `gcodes/collection-${timestamp}.zip` }, + { items, dest: `config/gcodes-${timestamp}.zip` }, { action: 'files/downloadZip', loading: 'gcodeDownloadZip' } ) diff --git a/src/components/panels/Machine/ConfigFilesPanel.vue b/src/components/panels/Machine/ConfigFilesPanel.vue index 9cad5f4a5..8c4cd1820 100644 --- a/src/components/panels/Machine/ConfigFilesPanel.vue +++ b/src/components/panels/Machine/ConfigFilesPanel.vue @@ -962,7 +962,14 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) { } await addElementToItems(this.absolutePath, this.selectedFiles) - this.$socket.emit('server.files.zip', { items }, { action: 'files/downloadZip', loading: 'configDownloadZip' }) + const date = new Date() + const timestamp = `${date.getFullYear()}${date.getMonth()}${date.getDay()}-${date.getHours()}${date.getMinutes()}${date.getSeconds()}` + + this.$socket.emit( + 'server.files.zip', + { items, dest: `config/${this.root}-${timestamp}.zip` }, + { action: 'files/downloadZip', loading: 'configDownloadZip' } + ) this.selectedFiles = [] } diff --git a/src/components/panels/Timelapse/TimelapseFilesPanel.vue b/src/components/panels/Timelapse/TimelapseFilesPanel.vue index aa7d028bc..41353bbd8 100644 --- a/src/components/panels/Timelapse/TimelapseFilesPanel.vue +++ b/src/components/panels/Timelapse/TimelapseFilesPanel.vue @@ -734,7 +734,7 @@ export default class TimelapseFilesPanel extends Mixins(BaseMixin) { this.$socket.emit( 'server.files.zip', - { items, dest: `timelapse/collection-${timestamp}.zip` }, + { items, dest: `timelapse/timelapse-${timestamp}.zip` }, { action: 'files/downloadZip', loading: 'timelapseDownloadZip' } )