Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 10:49:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update isCorrupted with name indexing

Browse source
This commit is contained in:
Atlante45 2018-02-20 11:48:25 -08:00
parent 3401882dc7
commit 0c7f5250f3
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) { bool AssetsBackupHandler::isCorruptedBackup(const QString& backupName) {
auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) { auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
return value.filePath == filePath; return value.name == backupName;
}); });
if (it == end(_backups)) { 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 recoverBackup(const QString& backupName, QuaZip& zip) override;
void deleteBackup(const QString& backupName) override; void deleteBackup(const QString& backupName) override;
void consolidateBackup(const QString& backupName, QuaZip& zip) 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; } 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 recoverBackup(const QString& backupName, QuaZip& zip) = 0;
virtual void deleteBackup(const QString& backupName) = 0; virtual void deleteBackup(const QString& backupName) = 0;
virtual void consolidateBackup(const QString& backupName, QuaZip& zip) = 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>; 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 {} 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: private:
DomainServerSettingsManager& _settingsManager; DomainServerSettingsManager& _settingsManager;

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

@ -372,7 +372,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
isAvailable &= handlerIsAvailable; isAvailable &= handlerIsAvailable;
availabilityProgress += progress / _backupHandlers.size(); availabilityProgress += progress / _backupHandlers.size();
isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.absolutePath); isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.id);
} }
variantBackups.push_back(QVariantMap({ variantBackups.push_back(QVariantMap({
{ "id", backup.id }, { "id", backup.id },

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

@ -35,7 +35,7 @@ public:
// Create a full backup // Create a full backup
void consolidateBackup(const QString& backupName, QuaZip& zip) override {} 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: private:
QString _entitiesFilePath; QString _entitiesFilePath;