diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp index 4bd2d9b2c4..b979aab993 100644 --- a/domain-server/src/AssetsBackupHandler.cpp +++ b/domain-server/src/AssetsBackupHandler.cpp @@ -111,9 +111,9 @@ void AssetsBackupHandler::checkForAssetsToDelete() { } } -bool AssetsBackupHandler::isCorruptedBackup(const QString& filePath) { - auto it = find_if(begin(_backups), end(_backups), [&](const std::vector::value_type& value) { - return value.filePath == filePath; +bool AssetsBackupHandler::isCorruptedBackup(const QString& backupName) { + auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) { + return value.name == backupName; }); if (it == end(_backups)) { diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h index d223e4f8f7..f94ba43cdf 100644 --- a/domain-server/src/AssetsBackupHandler.h +++ b/domain-server/src/AssetsBackupHandler.h @@ -39,7 +39,7 @@ public: void recoverBackup(const QString& backupName, QuaZip& zip) override; void deleteBackup(const QString& backupName) override; void consolidateBackup(const QString& backupName, QuaZip& zip) override; - bool isCorruptedBackup(const QString& absoluteFilePath) override; + bool isCorruptedBackup(const QString& backupName) override; bool operationInProgress() { return getRecoveryStatus().first; } diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h index 1971db79df..1e2450cce4 100644 --- a/domain-server/src/BackupHandler.h +++ b/domain-server/src/BackupHandler.h @@ -32,7 +32,7 @@ public: virtual void recoverBackup(const QString& backupName, QuaZip& zip) = 0; virtual void deleteBackup(const QString& backupName) = 0; virtual void consolidateBackup(const QString& backupName, QuaZip& zip) = 0; - virtual bool isCorruptedBackup(const QString& absoluteFilePath) = 0; + virtual bool isCorruptedBackup(const QString& backupName) = 0; }; using BackupHandlerPointer = std::unique_ptr; diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h index e8bff3d12e..a33fa3ca3f 100644 --- a/domain-server/src/ContentSettingsBackupHandler.h +++ b/domain-server/src/ContentSettingsBackupHandler.h @@ -32,7 +32,7 @@ public: void consolidateBackup(const QString& backupName, QuaZip& zip) override {} - bool isCorruptedBackup(const QString& absoluteFilePath) override { return true; } + bool isCorruptedBackup(const QString& backupName) override { return false; } private: DomainServerSettingsManager& _settingsManager; diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp index 23064862e5..9c72d64eea 100644 --- a/domain-server/src/DomainContentBackupManager.cpp +++ b/domain-server/src/DomainContentBackupManager.cpp @@ -372,7 +372,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro isAvailable &= handlerIsAvailable; availabilityProgress += progress / _backupHandlers.size(); - isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.absolutePath); + isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.id); } variantBackups.push_back(QVariantMap({ { "id", backup.id }, diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h index 1b524b4d90..802c395b57 100644 --- a/domain-server/src/EntitiesBackupHandler.h +++ b/domain-server/src/EntitiesBackupHandler.h @@ -35,7 +35,7 @@ public: // Create a full backup void consolidateBackup(const QString& backupName, QuaZip& zip) override {} - bool isCorruptedBackup(const QString& absoluteFilePath) override { return false; } + bool isCorruptedBackup(const QString& backupName) override { return false; } private: QString _entitiesFilePath;