jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-06 10:03:26 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Client] Read path settings inside isPortableBackupExcluded

Browse source
This commit is contained in:
Lukas Brübach 2026-10-15 19:34:01 +02:00
parent 4b07b9576d
commit b429561bc8
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cockatrice/src/interface/window_main.cpp
View file

@ -662,13 +662,15 @@ static QString resolveBackupRoot(const QString &appDir)
// True when a portable offender must stay out of the safety backup: replays (size), // True when a portable offender must stay out of the safety backup: replays (size),
// downloaded pictures (large and re-downloadable - everything under pics/ except the // downloaded pictures (large and re-downloadable - everything under pics/ except the
// seeded CUSTOM dir) and the regenerable redirect/cache dir. // seeded CUSTOM dir) and the regenerable redirect/cache dir.
static bool isPortableBackupExcluded(const QString &offender, static bool isPortableBackupExcluded(const QString &offender)
const QString &replaysPath,
const QString &picsPath,
const QString &customPicsPath,
const QString &redirectsPath,
const QString &cacheDir)
{ {
auto &paths = SettingsCache::instance().paths();
const QString replaysPath = QDir::cleanPath(paths.getReplaysPath());
const QString picsPath = QDir::cleanPath(paths.getPicsPath());
const QString customPicsPath = QDir::cleanPath(paths.getCustomPicsPath());
const QString redirectsPath = QDir::cleanPath(paths.getRedirectCachePath());
const QString cacheDir = QDir::cleanPath(SettingsCache::instance().getCachePath());
if (!replaysPath.isEmpty() && PathsSettings::isInsideDir(offender, replaysPath)) { if (!replaysPath.isEmpty() && PathsSettings::isInsideDir(offender, replaysPath)) {
return true; return true;
} }
@ -734,17 +736,12 @@ MainWindow::AtRiskPaths MainWindow::collectPortableAtRiskPaths(const QString &ap
// old uninstaller deletes all the same. Cover any offender that is not // old uninstaller deletes all the same. Cover any offender that is not
// already inside a backed-up source; when an offender is a parent of // already inside a backed-up source; when an offender is a parent of
// already-collected sources it supersedes them. // already-collected sources it supersedes them.
const QString replaysPath = QDir::cleanPath(paths.getReplaysPath());
const QString picsPath = QDir::cleanPath(paths.getPicsPath());
const QString customPicsPath = QDir::cleanPath(paths.getCustomPicsPath());
const QString redirectsPath = QDir::cleanPath(paths.getRedirectCachePath());
const QString cacheDir = QDir::cleanPath(SettingsCache::instance().getCachePath());
for (const QString &offender : paths.pathsInsideDir(appDir)) { for (const QString &offender : paths.pathsInsideDir(appDir)) {
if (!QFileInfo::exists(offender)) { if (!QFileInfo::exists(offender)) {
continue; continue;
} }
const QString cleanedOffender = QDir::cleanPath(offender); const QString cleanedOffender = QDir::cleanPath(offender);
if (isPortableBackupExcluded(cleanedOffender, replaysPath, picsPath, customPicsPath, redirectsPath, cacheDir)) { if (isPortableBackupExcluded(cleanedOffender)) {
continue; continue;
} }
mergeCoveringSource(atRisk.sourcesToBackUp, cleanedOffender); mergeCoveringSource(atRisk.sourcesToBackUp, cleanedOffender);