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

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

Browse source 
Never delete assets on load
This commit is contained in:
Stephen Birarda 2018-02-22 19:49:19 -07:00 committed by GitHub
commit 32830cbcd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,10 +217,11 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
backup.mappings[assetPath] = assetHash; backup.mappings[assetPath] = assetHash;
_assetsInBackups.insert(assetHash); _assetsInBackups.insert(assetHash);
} }
}
void AssetsBackupHandler::loadingComplete() {
checkForMissingAssets(); checkForMissingAssets();
checkForAssetsToDelete(); checkForAssetsToDelete();
return;
} }
void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) { void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {

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

@ -35,6 +35,7 @@ public:
std::pair<bool, float> getRecoveryStatus() override; std::pair<bool, float> getRecoveryStatus() override;
void loadBackup(const QString& backupName, QuaZip& zip) override; void loadBackup(const QString& backupName, QuaZip& zip) override;
void loadingComplete() override;
void createBackup(const QString& backupName, QuaZip& zip) override; void createBackup(const QString& backupName, QuaZip& zip) override;
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;

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

@ -28,6 +28,7 @@ public:
virtual std::pair<bool, float> getRecoveryStatus() = 0; virtual std::pair<bool, float> getRecoveryStatus() = 0;
virtual void loadBackup(const QString& backupName, QuaZip& zip) = 0; virtual void loadBackup(const QString& backupName, QuaZip& zip) = 0;
virtual void loadingComplete() = 0;
virtual void createBackup(const QString& backupName, QuaZip& zip) = 0; virtual void createBackup(const QString& backupName, QuaZip& zip) = 0;
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;

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

@ -24,6 +24,8 @@ public:
void loadBackup(const QString& backupName, QuaZip& zip) override {} void loadBackup(const QString& backupName, QuaZip& zip) override {}
void loadingComplete() override {}
void createBackup(const QString& backupName, QuaZip& zip) override; void createBackup(const QString& backupName, QuaZip& zip) override;
void recoverBackup(const QString& backupName, QuaZip& zip) override; void recoverBackup(const QString& backupName, QuaZip& zip) override;

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

@ -471,6 +471,10 @@ void DomainContentBackupManager::load() {
zip.close(); zip.close();
} }
for (auto& handler : _backupHandlers) {
handler->loadingComplete();
}
} }
void DomainContentBackupManager::backup() { void DomainContentBackupManager::backup() {

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

@ -23,6 +23,8 @@ public:
void loadBackup(const QString& backupName, QuaZip& zip) override {} void loadBackup(const QString& backupName, QuaZip& zip) override {}
void loadingComplete() override {}
// Create a skeleton backup // Create a skeleton backup
void createBackup(const QString& backupName, QuaZip& zip) override; void createBackup(const QString& backupName, QuaZip& zip) override;