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

Revert "Feature/continuumatrice product migration"

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-03 18:51:23 -07:00 • committed by GitHub
parent 533d2f04c1
commit e49d053838
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
150 changed files with 2599 additions and 5304 deletions
Download patch file Download diff file Expand all files Collapse all files

41
cockatrice/src/main.cpp
View file

@ -69,7 +69,6 @@
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/rng/rng_sfmt.h>
#include <libcockatrice/settings/card_database_settings.h>
#include <libcockatrice/settings/download_settings.h>
#include <libcockatrice/settings/interface_settings.h>
#include <libcockatrice/settings/network_settings.h>
#include <libcockatrice/settings/personal_settings.h>
@ -85,7 +84,7 @@ SoundEngine *soundEngine;
QSystemTrayIcon *trayIcon;
ThemeManager *themeManager;
const QString translationPrefix = "cockatrice"; // Keep inherited translation catalogue until retranslated.
const QString translationPrefix = "cockatrice";
QString translationPath;
static void CockatriceLogger(QtMsgType type, const QMessageLogContext &ctx, const QString &message)
@ -138,9 +137,9 @@ QString const generateClientID()
static QString redactActivationUrl(const QString &url)
{
// Activation URLs carry secrets in their query string (e.g. the deck share
// token); log only the scheme and the action (continuumatrice://opendeck), never
// token); log only the scheme and the action (cockatrice://opendeck), never
// the parameters.
if (!url.startsWith(QStringLiteral("continuumatrice://"))) {
if (!url.startsWith(QStringLiteral("cockatrice://"))) {
return url;
}
const QUrl parsed(url);
@ -220,7 +219,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
#ifdef Q_OS_MAC
UrlSchemeEventFilter cockatriceFilter(QStringList{QStringLiteral("continuumatrice")});
UrlSchemeEventFilter cockatriceFilter(QStringList{QStringLiteral("cockatrice")});
QStringList pendingMacUrls;
@ -258,7 +257,7 @@ int main(int argc, char *argv[])
// Declared before crash-reporter init: the startup attach below needs the log tail while the
// file still holds the crashed session's lines.
const QString persistentLogPath =
SettingsCache::instance().getSettingsPath() + QStringLiteral("logs/continuumatrice.log");
SettingsCache::instance().getSettingsPath() + QStringLiteral("logs/cockatrice.log");
Logger::getInstance().setPersistentLogPath(persistentLogPath);
// Crash reporting: init the SDK early so a crash anywhere below is captured into the
@ -334,7 +333,7 @@ int main(int argc, char *argv[])
#elif defined(Q_OS_WIN)
translationPath = qApp->applicationDirPath() + "/translations";
#else // linux
translationPath = qApp->applicationDirPath() + "/../share/continuumatrice/translations";
translationPath = qApp->applicationDirPath() + "/../share/cockatrice/translations";
#endif
// Command-line parser
@ -417,24 +416,6 @@ int main(int argc, char *argv[])
CardDatabaseManager::setCardDatabasePathProvider(&SettingsCache::instance());
CardDatabaseManager::setCardSetPriorityController(&SettingsCache::instance().cardDatabase());
// Existing early fork profiles may still contain the upstream Scryfall /
// Gatherer defaults saved by older builds. Migrate only known MTG provider
// URLs, leaving user-authored Continuum Universes endpoints untouched.
auto &downloadSettings = SettingsCache::instance().downloads();
const QStringList savedImageUrls = downloadSettings.getAllURLs();
QStringList compatibleImageUrls;
for (const QString &url : savedImageUrls) {
if (!url.contains(QStringLiteral("scryfall.com"), Qt::CaseInsensitive) &&
!url.contains(QStringLiteral("scryfall.io"), Qt::CaseInsensitive) &&
!url.contains(QStringLiteral("gatherer.wizards.com"), Qt::CaseInsensitive)) {
compatibleImageUrls.append(url);
}
}
if (compatibleImageUrls != savedImageUrls) {
downloadSettings.setDownloadUrls(compatibleImageUrls);
qCInfo(MainLog) << "Removed inherited MTG image sources from Continuumatrice profile.";
}
qCInfo(MainLog) << "Starting main program";
// Front-load the card database before constructing the main window. The
@ -467,7 +448,7 @@ int main(int argc, char *argv[])
// auto-connect must not race against it (two connectToServer calls tear
// each other down via doDisconnectFromServer).
bool hasUrlActivation = std::any_of(startupFiles.begin(), startupFiles.end(), [](const QString &file) {
return file.startsWith(QStringLiteral("continuumatrice://"));
return file.startsWith(QStringLiteral("cockatrice://"));
});
#ifdef Q_OS_MAC
// On macOS the launch can arrive through the URL scheme instead of as a
@ -475,12 +456,12 @@ int main(int argc, char *argv[])
// window would auto-connect into the link's own connection attempt.
hasUrlActivation = hasUrlActivation ||
std::any_of(pendingMacUrls.cbegin(), pendingMacUrls.cend(),
[](const QString &url) { return url.startsWith(QStringLiteral("continuumatrice://")); });
[](const QString &url) { return url.startsWith(QStringLiteral("cockatrice://")); });
#endif
ui.setSkipStartupAutoConnect(hasUrlActivation);
auto handleActivation = [&ui](const QString &file) {
if (file.startsWith("continuumatrice://")) {
if (file.startsWith("cockatrice://")) {
qCInfo(MainLog) << "Handling URL activation:" << redactActivationUrl(file);
// Route through the window's persistent url parser: it serializes
// link chains so activations handed over while another chain is
@ -506,12 +487,12 @@ int main(int argc, char *argv[])
}
qCInfo(MainLog) << "MainWindow constructor finished";
ui.setWindowIcon(themePixmap(QStringLiteral("continuumatrice")));
ui.setWindowIcon(themePixmap(QStringLiteral("cockatrice")));
// Base name of the desktop file installed next to the binary, without the ".desktop"
// extension. Wayland reads the window icon from it, and xdg-desktop-portal looks up
// org.freedesktop.host.portal.Registry by this app ID, so it has to match the file name
// exactly, down to the case.
QGuiApplication::setDesktopFileName("continuumatrice");
QGuiApplication::setDesktopFileName("cockatrice");
SettingsCache::instance().network().setClientID(generateClientID());