From 7fd6ac9bd9ac4b5753dbda2d11fd53ce62c6c0fb Mon Sep 17 00:00:00 2001 From: Mathis Mensing Date: Mon, 29 Jan 2024 21:32:10 +0100 Subject: [PATCH] feat(FileSystem): add crowsnest backup file filter Signed-off-by: Mathis Mensing --- src/components/widgets/filesystem/FileSystem.vue | 6 ++++++ src/components/widgets/filesystem/FileSystemFilterMenu.vue | 7 +++++++ src/locales/en.yaml | 1 + src/store/files/getters.ts | 2 +- src/store/files/types.ts | 2 +- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/widgets/filesystem/FileSystem.vue b/src/components/widgets/filesystem/FileSystem.vue index a1e19fdef5..a74b21188a 100644 --- a/src/components/widgets/filesystem/FileSystem.vue +++ b/src/components/widgets/filesystem/FileSystem.vue @@ -422,6 +422,12 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM return false } break + + case 'crowsnest_backup_files': + if (file.type === 'file' && file.filename.match(/^crowsnest\.conf\.\d{4}-\d{2}-\d{2}-\d{4}$/)) { + return false + } + break } } diff --git a/src/components/widgets/filesystem/FileSystemFilterMenu.vue b/src/components/widgets/filesystem/FileSystemFilterMenu.vue index 64ca0c74c4..e49eda76cc 100644 --- a/src/components/widgets/filesystem/FileSystemFilterMenu.vue +++ b/src/components/widgets/filesystem/FileSystemFilterMenu.vue @@ -128,6 +128,13 @@ export default class FileSystemFilterMenu extends Vue { }) } + if (rootFilterTypes.includes('crowsnest_backup_files')) { + filters.push({ + type: 'crowsnest_backup_files', + text: this.$tc('app.file_system.filters.label.crowsnest_backup_files') + }) + } + return filters } diff --git a/src/locales/en.yaml b/src/locales/en.yaml index 927a6dbfda..517ec73457 100644 --- a/src/locales/en.yaml +++ b/src/locales/en.yaml @@ -71,6 +71,7 @@ app: file_system: filters: label: + crowsnest_backup_files: Filter Crowsnest backup files print_start_time: Filter printed print_start_time_desc: Filters out items you've already printed. hidden_files_folders: Filter hidden files and folders diff --git a/src/store/files/getters.ts b/src/store/files/getters.ts index 2b37bfcf6e..1c7b25c2ec 100644 --- a/src/store/files/getters.ts +++ b/src/store/files/getters.ts @@ -119,7 +119,7 @@ export const getters: GetterTree = { accepts: ['.conf', '.cfg', '.md', '.css', '.jpg', '.jpeg', '.png', '.gif'], canView, canConfigure: false, - filterTypes: ['hidden_files', 'klipper_backup_files', 'moonraker_backup_files'] + filterTypes: ['hidden_files', 'klipper_backup_files', 'moonraker_backup_files', 'crowsnest_backup_files'] } case 'config_examples': return { diff --git a/src/store/files/types.ts b/src/store/files/types.ts index 16ceddd114..86ae649f55 100644 --- a/src/store/files/types.ts +++ b/src/store/files/types.ts @@ -108,7 +108,7 @@ export interface FilesUpload extends FileDownload { cancelled: boolean; // in a cancelled state, don't show - nor try to upload. } -export type FileFilterType = 'print_start_time' | 'hidden_files' | 'klipper_backup_files' | 'rolled_log_files' | 'moonraker_backup_files' +export type FileFilterType = 'print_start_time' | 'hidden_files' | 'klipper_backup_files' | 'rolled_log_files' | 'moonraker_backup_files' | 'crowsnest_backup_files' export type FileBrowserEntry = AppFile | AppFileWithMeta | AppDirectory