mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-08 11:03:25 -08:00
[Settings] Back up the settings folder before migrating (#7386)
* [Settings] Back up the settings folder before migrating The per-file settings migration only preserved global.ini, as global.ini.old. Everything else the migrations write was overwritten in place with no way back: the legacy migration and the 17 per-domain migrateXxxSettings functions all write straight into the per-domain .ini files, so any of them that got a key mapping wrong silently replaced a working file. The re-migration path is the sharpest case, because migrateSettingsFromGlobalIni() runs again whenever an older build wrote non-sentinel keys back into global.ini, and those values then land on top of per-domain files the user had already edited. Snapshot the whole settings folder before either migration runs, into a timestamped sibling settings-backup-<yyyyMMdd-HHmmss>. A sibling rather than a child, so a backup is never copied into the next backup and the "Open Settings Folder" action keeps showing only live files. Keep every snapshot; settings files are kilobytes, so growth is not a concern. SettingsMigration::isMigrationPending() gates the copy so a normal start creates nothing. It reuses the same condition migrateSettingsFromGlobalIni() uses to decide whether it has work, factored into a shared helper so the two cannot drift, and it ignores the legacy migration on an empty profile where that migration only writes its sentinel. The backup itself skips a folder whose files are all empty, which covers a fresh profile whose global.ini was created but never written. A failed copy logs a warning and returns an empty path rather than aborting the migration, since a full disk or an unwritable data folder must not leave the client unable to start. global.ini.old still works as the single-file escape hatch. Document the folder layout, the automatic backups, and the fact that migrations only run forwards, so users know to copy the settings folder before downgrading to a version that cannot read the per-group files. * [Client] Match the desktop file name case for the portal app ID QGuiApplication::setDesktopFileName() was given "Cockatrice"/"Oracle" while the installed desktop entries are cockatrice.desktop and oracle.desktop. Linux paths are case-sensitive, so xdg-desktop-portal failed the app-info lookup for "Cockatrice" and Qt warned on every QDesktopServices call that it could not register with the host portal. The same string becomes the xdg-shell appId, so the window icon lookup failed on Wayland for the same reason. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
b8b81170bf
commit
3aba1ef929
8 changed files with 372 additions and 16 deletions
|
|
@ -1,12 +1,44 @@
|
|||
#include "settings_migration.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QDir>
|
||||
#include <QDirIterator>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QLoggingCategory>
|
||||
#include <QMap>
|
||||
#include <QSettings>
|
||||
#include <QStringList>
|
||||
#include <algorithm>
|
||||
|
||||
inline Q_LOGGING_CATEGORY(SettingsMigrationLog, "settings_migration");
|
||||
|
||||
static const QString MIGRATION_SENTINEL_KEY = QStringLiteral("migration/perfile_complete");
|
||||
|
||||
/**
|
||||
* True when global.ini holds keys that migrateSettingsFromGlobalIni() would still move, i.e. the
|
||||
* exact condition that function uses to decide whether it has work to do. If a user runs an older
|
||||
* Cockatrice build that writes to global.ini (non-sentinel keys) and then upgrades back, those new
|
||||
* keys would otherwise be silently ignored, so they are re-migrated instead.
|
||||
*/
|
||||
static bool hasPendingGlobalIniSettings(const QString &settingsPath)
|
||||
{
|
||||
if (!QFile::exists(settingsPath + "global.ini")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
QSettings globalIni(settingsPath + "global.ini", QSettings::IniFormat);
|
||||
if (!globalIni.value(MIGRATION_SENTINEL_KEY, false).toBool()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// The sentinel is set, so any key besides it was written after the migration, i.e. by an
|
||||
// older build sharing this file. Those are exactly the keys to re-migrate.
|
||||
QStringList otherKeys = globalIni.allKeys();
|
||||
otherKeys.removeAll(MIGRATION_SENTINEL_KEY);
|
||||
return !otherKeys.isEmpty();
|
||||
}
|
||||
|
||||
static void migrateTabsSettings(const QString &settingsPath, QSettings &globalIni)
|
||||
{
|
||||
if (!globalIni.contains("tabs/visualDeckStorage") && !globalIni.contains("tabs/server") &&
|
||||
|
|
@ -658,21 +690,11 @@ bool SettingsMigration::migrateLegacySettings(const QString &settingsPath)
|
|||
|
||||
bool SettingsMigration::migrateSettingsFromGlobalIni(const QString &settingsPath)
|
||||
{
|
||||
if (!QFile::exists(settingsPath + "global.ini")) {
|
||||
if (!hasPendingGlobalIniSettings(settingsPath)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
QSettings globalIni(settingsPath + "global.ini", QSettings::IniFormat);
|
||||
if (globalIni.value(MIGRATION_SENTINEL_KEY, false).toBool()) {
|
||||
// If a user runs an older Cockatrice build that writes to global.ini (non-sentinel keys)
|
||||
// and then upgrades back, those new keys will be silently ignored. Re-migrate them.
|
||||
globalIni.sync();
|
||||
auto allKeys = globalIni.allKeys();
|
||||
allKeys.removeAll(MIGRATION_SENTINEL_KEY);
|
||||
if (allKeys.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
migrateTabsSettings(settingsPath, globalIni);
|
||||
migrateSoundSettings(settingsPath, globalIni);
|
||||
|
|
@ -700,3 +722,78 @@ bool SettingsMigration::migrateSettingsFromGlobalIni(const QString &settingsPath
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SettingsMigration::isMigrationPending(const QString &settingsPath)
|
||||
{
|
||||
if (hasPendingGlobalIniSettings(settingsPath)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
QSettings personalIni(settingsPath + "personal.ini", QSettings::IniFormat);
|
||||
if (personalIni.value("migration/legacy_complete", false).toBool()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// migrateLegacySettings() also runs on an empty profile, where it only writes its sentinel.
|
||||
// Reporting that as pending would leave a backup folder behind on every fresh install, so
|
||||
// only count it when there really are legacy keys left to move.
|
||||
return !QSettings().allKeys().isEmpty();
|
||||
}
|
||||
|
||||
QString SettingsMigration::backupSettingsDirectory(const QString &settingsPath)
|
||||
{
|
||||
QDir settingsDir(QDir::cleanPath(settingsPath));
|
||||
if (!settingsDir.exists()) {
|
||||
return QString();
|
||||
}
|
||||
|
||||
const QDir::Filters fileFilters = QDir::Files | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot;
|
||||
|
||||
// A profile holding nothing but empty files has nothing to lose, and backing it up would only
|
||||
// leave clutter next to the settings folder.
|
||||
const QFileInfoList files = settingsDir.entryInfoList(fileFilters);
|
||||
const bool hasContent =
|
||||
std::any_of(files.cbegin(), files.cend(), [](const QFileInfo &file) { return file.size() > 0; });
|
||||
if (!hasContent) {
|
||||
return QString();
|
||||
}
|
||||
|
||||
// Keep the backup a sibling of the settings folder rather than a child: a folder that is never
|
||||
// copied into its own backup, and one the "Open settings folder" action does not have to skip.
|
||||
QDir backupParentDir(settingsDir.absolutePath());
|
||||
if (!backupParentDir.cdUp()) {
|
||||
qCWarning(SettingsMigrationLog) << "[SettingsMigration] Could not resolve the parent of the settings folder:"
|
||||
<< settingsDir.absolutePath();
|
||||
return QString();
|
||||
}
|
||||
|
||||
const QString backupName =
|
||||
QStringLiteral("settings-backup-") + QDateTime::currentDateTime().toString("yyyyMMdd-HHmmss");
|
||||
QString backupPath = backupParentDir.absoluteFilePath(backupName);
|
||||
// Two migrations inside the same second must not merge into a single folder.
|
||||
for (int suffix = 1; QFileInfo::exists(backupPath); ++suffix) {
|
||||
backupPath = backupParentDir.absoluteFilePath(backupName + '-' + QString::number(suffix));
|
||||
}
|
||||
|
||||
if (!QDir().mkpath(backupPath)) {
|
||||
qCWarning(SettingsMigrationLog) << "[SettingsMigration] Could not create the settings backup folder:"
|
||||
<< backupPath;
|
||||
return QString();
|
||||
}
|
||||
|
||||
QDir backupDir(backupPath);
|
||||
QDirIterator it(settingsDir.absolutePath(), fileFilters, QDirIterator::Subdirectories);
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
|
||||
const QString target = backupDir.absoluteFilePath(settingsDir.relativeFilePath(it.filePath()));
|
||||
QDir().mkpath(QFileInfo(target).absolutePath());
|
||||
if (!QFile::copy(it.filePath(), target)) {
|
||||
// A partially copied backup still beats none: report it and let the migration run.
|
||||
qCWarning(SettingsMigrationLog) << "[SettingsMigration] Could not back up settings file:" << it.filePath();
|
||||
}
|
||||
}
|
||||
|
||||
qCInfo(SettingsMigrationLog) << "[SettingsMigration] Settings backed up to" << backupPath;
|
||||
return backupPath;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue