mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 01:23:24 -08:00
3aba1ef929
* [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>
96 lines
3.3 KiB
C++
96 lines
3.3 KiB
C++
#include "main.h"
|
|
|
|
#include "interface/theme_manager.h"
|
|
#include "oraclewizard.h"
|
|
|
|
#include <../../cockatrice/src/client/settings/cache_settings.h>
|
|
#include <QApplication>
|
|
#include <QCommandLineParser>
|
|
#include <QIcon>
|
|
#include <QLibraryInfo>
|
|
#include <QTimer>
|
|
#include <QTranslator>
|
|
#include <libcockatrice/settings/personal_settings.h>
|
|
|
|
QTranslator *translator, *qtTranslator;
|
|
ThemeManager *themeManager;
|
|
|
|
const QString translationPrefix = "oracle";
|
|
QString translationPath;
|
|
bool isSpoilersOnly;
|
|
bool isBackgrounded;
|
|
|
|
void installNewTranslator()
|
|
{
|
|
QString lang = SettingsCache::instance().personal().getLang();
|
|
|
|
QString qtNameHint = "qt_" + lang;
|
|
QString qtTranslationPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
|
|
|
|
bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath);
|
|
if (!qtTranslationLoaded) {
|
|
qDebug() << "Unable to load qt translation" << qtNameHint << "at" << qtTranslationPath;
|
|
} else {
|
|
qDebug() << "Loaded qt translation" << qtNameHint << "at" << qtTranslationPath;
|
|
}
|
|
qApp->installTranslator(qtTranslator);
|
|
|
|
QString appNameHint = translationPrefix + "_" + lang;
|
|
bool appTranslationLoaded = qtTranslator->load(appNameHint, translationPath);
|
|
if (!appTranslationLoaded) {
|
|
qDebug() << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
|
|
} else {
|
|
qDebug() << "Loaded" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
|
|
}
|
|
qApp->installTranslator(translator);
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
QApplication app(argc, argv);
|
|
|
|
QCoreApplication::setOrganizationName("Cockatrice");
|
|
QCoreApplication::setOrganizationDomain("Cockatrice");
|
|
// This can't be changed, as it influences the default save path for cards.xml
|
|
QCoreApplication::setApplicationName("Cockatrice");
|
|
|
|
// If the program is opened with the -s flag, it will only do spoilers. Otherwise it will do MTGJSON/Tokens
|
|
QCommandLineParser parser;
|
|
QCommandLineOption spoilersOnlyOption("s", QCoreApplication::translate("main", "Only run in spoiler mode"));
|
|
QCommandLineOption backgroundOption("b", QCoreApplication::translate("main", "Run in no-confirm background mode"));
|
|
parser.addOption(spoilersOnlyOption);
|
|
parser.addOption(backgroundOption);
|
|
parser.process(app);
|
|
isSpoilersOnly = parser.isSet(spoilersOnlyOption);
|
|
isBackgrounded = parser.isSet(backgroundOption);
|
|
|
|
#ifdef Q_OS_MAC
|
|
translationPath = qApp->applicationDirPath() + "/../Resources/translations";
|
|
#elif defined(Q_OS_WIN)
|
|
translationPath = qApp->applicationDirPath() + "/translations";
|
|
#else // linux
|
|
translationPath = qApp->applicationDirPath() + "/../share/oracle/translations";
|
|
#endif
|
|
|
|
themeManager = new ThemeManager;
|
|
|
|
qtTranslator = new QTranslator;
|
|
translator = new QTranslator;
|
|
installNewTranslator();
|
|
|
|
OracleWizard wizard;
|
|
|
|
QIcon icon("theme:appicon.svg");
|
|
wizard.setWindowIcon(icon);
|
|
// Base name of the installed oracle.desktop; wayland reads the window icon from it and
|
|
// xdg-desktop-portal registers it as the app ID, so the case has to match the file name.
|
|
QGuiApplication::setDesktopFileName("oracle");
|
|
|
|
wizard.show();
|
|
|
|
if (isBackgrounded) {
|
|
QTimer::singleShot(0, &wizard, [&wizard]() { wizard.runInBackground(); });
|
|
}
|
|
|
|
return app.exec();
|
|
}
|