From 534a9f50b6f880c4a88df81b3757f168371bddf2 Mon Sep 17 00:00:00 2001 From: izzy Date: Fri, 21 Nov 2025 18:19:08 +0000 Subject: [PATCH] fix: make sure backups are correctly sorted for clean up --- server/src/services/backup.service.ts | 5 ++++- server/src/services/maintenance.service.spec.ts | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/services/backup.service.ts b/server/src/services/backup.service.ts index 71ea7fef0a..7de5bddeb7 100644 --- a/server/src/services/backup.service.ts +++ b/server/src/services/backup.service.ts @@ -56,7 +56,10 @@ export class BackupService extends BaseService { const backupsFolder = StorageCore.getBaseFolder(StorageFolder.Backups); const files = await this.storageRepository.readdir(backupsFolder); - const backups = files.filter((fn) => isValidRoutineBackupName(fn)); + const backups = files + .filter((fn) => isValidRoutineBackupName(fn)) + .toSorted() + .toReversed(); const failedBackups = files.filter((fn) => isFailedBackupName(fn)); const toDelete = backups.slice(config.keepLastAmount); diff --git a/server/src/services/maintenance.service.spec.ts b/server/src/services/maintenance.service.spec.ts index 575ad91d5e..51e926ce33 100644 --- a/server/src/services/maintenance.service.spec.ts +++ b/server/src/services/maintenance.service.spec.ts @@ -151,7 +151,6 @@ describe(MaintenanceService.name, () => { 'immich-db-backup-20250727T110116-v1.234.5-pg14.5.sql.gz', 'immich-db-backup-1753789649000.sql.gz', ], - failedBackups: ['immich-db-backup-20250725T110216-v1.234.5-pg14.5.sql.gz.tmp'], }); }); });