Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 12:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12442 from Atlante45/feat/backups-integration

Browse source 
Update isCorrupted with name indexing
This commit is contained in:
Stephen Birarda 2018-02-20 15:25:08 -07:00 committed by GitHub
commit 52a24f436c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain-server/src/AssetsBackupHandler.cpp
View file

@ -111,9 +111,9 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
}
}
bool AssetsBackupHandler::isCorruptedBackup(const QString& filePath) {
auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::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)) {

2
domain-server/src/AssetsBackupHandler.h
View file

@ -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; }

2
domain-server/src/BackupHandler.h
View file

@ -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<BackupHandlerInterface>;

2
domain-server/src/ContentSettingsBackupHandler.h
View file

@ -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;

2
domain-server/src/DomainContentBackupManager.cpp
View file

@ -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 },

2
domain-server/src/EntitiesBackupHandler.h
View file

@ -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;