From 85c1739df42f4dd0fdefac17ccb8dc9a710f7c5c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 16 Feb 2018 15:49:10 -0800 Subject: [PATCH] Fix filename not being passed in correctly --- domain-server/src/DomainContentBackupManager.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp index 4457df49f1..a218ee87ea 100644 --- a/domain-server/src/DomainContentBackupManager.cpp +++ b/domain-server/src/DomainContentBackupManager.cpp @@ -357,15 +357,6 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro return; } - QDir backupDir { _backupDirectory }; - auto matchingFiles = - backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + "*.zip", MANUAL_BACKUP_PREFIX + "*.zip" }, - QDir::Files | QDir::NoSymLinks, QDir::Name); - QString prefixFormat = "(" + QRegExp::escape(AUTOMATIC_BACKUP_PREFIX) + "|" + QRegExp::escape(MANUAL_BACKUP_PREFIX) + ")"; - QString nameFormat = "(.+)"; - QString dateTimeFormat = "(" + DATETIME_FORMAT_RE + ")"; - QRegExp backupNameFormat { prefixFormat + nameFormat + "-" + dateTimeFormat + "\\.zip" }; - auto backups = getAllBackups(); QVariantList variantBackups; @@ -376,7 +367,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro for (auto& handler : _backupHandlers) { bool handlerIsAvailable { true }; float progress { 0.0f }; - std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.name); + std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.id); isAvailable &= handlerIsAvailable; availabilityProgress += progress / _backupHandlers.size(); } @@ -462,7 +453,7 @@ void DomainContentBackupManager::load() { } for (auto& handler : _backupHandlers) { - handler->loadBackup(backup.name, zip); + handler->loadBackup(backup.id, zip); } zip.close();