From cfa3c47a03981872c358d3a85788ff4cc67600c2 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Thu, 2 Feb 2023 22:37:31 +0100 Subject: [PATCH 1/4] refactor(timelapse): rename download zip name Signed-off-by: Stefan Dej --- src/components/panels/Timelapse/TimelapseFilesPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' } ) From 9275bbccc8aa65f6edbe45509232e13e615d8337 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Thu, 2 Feb 2023 22:37:48 +0100 Subject: [PATCH 2/4] refactor(gcodefiles): rename download zip name Signed-off-by: Stefan Dej --- src/components/panels/GcodefilesPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue index a8daa17f3..880d19d83 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: `gcodes/gcodes-${timestamp}.zip` }, { action: 'files/downloadZip', loading: 'gcodeDownloadZip' } ) From eb94cf72e618fc545eb5a28240f5f44c669d0ba1 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Thu, 2 Feb 2023 22:45:49 +0100 Subject: [PATCH 3/4] refactor(configfiles): rename download zip name Signed-off-by: Stefan Dej --- src/components/panels/Machine/ConfigFilesPanel.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 = [] } From d9e710ec889e618d0769284112b64071d2b6c873 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Thu, 2 Feb 2023 22:53:55 +0100 Subject: [PATCH 4/4] refactor(gcodefiles): move zip destination to config root Signed-off-by: Stefan Dej --- src/components/panels/GcodefilesPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue index 880d19d83..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/gcodes-${timestamp}.zip` }, + { items, dest: `config/gcodes-${timestamp}.zip` }, { action: 'files/downloadZip', loading: 'gcodeDownloadZip' } )