mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
* [Client] Improve card database update visibility Addresses Cockatrice/Cockatrice#7431. Cockatrice previously offered no in-client feedback while the card database updater ran: the only progress UI lived in the first-run wizard, stderr/stdout were not parsed in interactive runs, and starting a second update with Oracle already open or with a hidden background run active just showed a confusing 'already running' guard - even though Oracle is launched as a separate process with no lifecycle tracking. - Add a status-bar widget (CardDatabaseUpdateStatusBar) that appears while an update runs and shows the Downloading/Parsing/Importing stages with percent progress; it is also used in the quit-confirm prompt so users see an unfinished update before cancelling it. - Parse the updater's PROGRESS lines (new CardUpdateProgressParser, unit-tested) in both foreground and background runs and log stage changes to the new card_database.update category, throttled to at most one line per second; forward Oracle stderr to the logs. - Show a tray balloon when a background update starts and on finish or failure instead of staying silent. - Request a running Oracle instance to raise itself (QLocalServer CockatriceOracleRaise-<user>) when the user starts another update, and demote the 'already running' guard to an informative message only when no running instance can be found. - Emit download/scan/import progress unconditionally from Oracle so interactive and background runs behave the same. - Document the new log category in the troubleshooting guide. * [Client] Address card database update review feedback * [Client] Add setting to control card database update tray notifications * [Client] Address remaining card database update review nits - Rename card_update_progress_parser.{h,cpp} to card_update_progress.{h,cpp} - Store the CardUpdateProgress struct in the status bar widget * Lint. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
222 lines
6.1 KiB
C++
222 lines
6.1 KiB
C++
#include "oraclewizard.h"
|
|
|
|
#include "client/settings/cache_settings.h"
|
|
#include "main.h"
|
|
#include "oracleimporter.h"
|
|
#include "pages.h"
|
|
#include "pagetemplates.h"
|
|
|
|
#include <QAbstractButton>
|
|
#include <QApplication>
|
|
#include <QDebug>
|
|
#include <QDialog>
|
|
#include <QEvent>
|
|
#include <QFile>
|
|
#include <QIODevice>
|
|
#include <QList>
|
|
#include <QLocalServer>
|
|
#include <QLocalSocket>
|
|
#include <QNetworkAccessManager>
|
|
#include <QSettings>
|
|
#include <QVariant>
|
|
#include <QWindow>
|
|
#include <QWizardPage>
|
|
#include <QtGlobal>
|
|
#include <libcockatrice/settings/cards_display_settings.h>
|
|
#include <libcockatrice/settings/personal_settings.h>
|
|
#include <libcockatrice/utility/local_server_name.h>
|
|
#include <qlogging.h>
|
|
|
|
class QWidget;
|
|
|
|
OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
|
|
{
|
|
// define a dummy context that will be used where needed
|
|
QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
|
|
|
|
#ifdef Q_OS_WIN
|
|
setWizardStyle(QWizard::ModernStyle);
|
|
#endif
|
|
|
|
QString oracleSettingsFile = SettingsCache::instance().getSettingsPath() + "oracle.ini";
|
|
settings = new QSettings(oracleSettingsFile, QSettings::IniFormat, this);
|
|
|
|
// We moved the oracle-specific settings from global.ini to a separate oracle.ini after 2.10
|
|
if (!QFile::exists(oracleSettingsFile)) {
|
|
migrateOracleSettings();
|
|
}
|
|
|
|
connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &OracleWizard::updateLanguage);
|
|
|
|
importer = new OracleImporter(this);
|
|
// Import card text in the language the client displays, if supported:
|
|
// foreignData for any other language is never imported.
|
|
importer->setCardLang(SettingsCache::instance().cardsDisplay().getCardLang());
|
|
|
|
nam = new QNetworkAccessManager(this);
|
|
|
|
QList<OracleWizardPage *> pages;
|
|
|
|
if (!isSpoilersOnly) {
|
|
pages << new IntroPage << new LoadSetsPage << new SaveSetsPage << new LoadTokensPage << new OutroPage;
|
|
} else {
|
|
pages << new LoadSpoilersPage << new OutroPage;
|
|
}
|
|
|
|
for (OracleWizardPage *page : pages) {
|
|
addPage(page);
|
|
|
|
// Connect background auto-advance
|
|
connect(page, &OracleWizardPage::readyToContinue, this, [this]() {
|
|
if (backgroundMode) {
|
|
next();
|
|
}
|
|
});
|
|
}
|
|
|
|
retranslateUi();
|
|
startRaiseServer();
|
|
}
|
|
|
|
/**
|
|
* Migrates the oracle-specific settings from global.ini to oracle.ini
|
|
*/
|
|
void OracleWizard::migrateOracleSettings()
|
|
{
|
|
QString filePath = SettingsCache::instance().getSettingsPath() + "global.ini";
|
|
auto globalSettings = QSettings(filePath, QSettings::IniFormat, this);
|
|
|
|
auto tryMigrateValue = [this, &globalSettings](const QString &name) {
|
|
QVariant variant = globalSettings.value(name);
|
|
if (variant.isValid()) {
|
|
settings->setValue(name, variant.toString());
|
|
}
|
|
};
|
|
|
|
tryMigrateValue("allsetsurl");
|
|
tryMigrateValue("tokensurl");
|
|
tryMigrateValue("spoilersurl");
|
|
}
|
|
|
|
void OracleWizard::updateLanguage()
|
|
{
|
|
qApp->removeTranslator(translator);
|
|
installNewTranslator();
|
|
}
|
|
|
|
void OracleWizard::changeEvent(QEvent *event)
|
|
{
|
|
if (event->type() == QEvent::LanguageChange) {
|
|
retranslateUi();
|
|
}
|
|
|
|
QDialog::changeEvent(event);
|
|
}
|
|
|
|
void OracleWizard::retranslateUi()
|
|
{
|
|
setWindowTitle(tr("Oracle Importer"));
|
|
for (int i = 0; i < pageIds().count(); i++) {
|
|
dynamic_cast<OracleWizardPage *>(page(i))->retranslateUi();
|
|
}
|
|
}
|
|
|
|
void OracleWizard::accept()
|
|
{
|
|
QDialog::accept();
|
|
}
|
|
|
|
void OracleWizard::reject()
|
|
{
|
|
// The wizard is being closed while a page may still run a worker on the
|
|
// importer. Ask it to stop before the wizard (and the importer child) is
|
|
// destroyed, so the worker thread never touches freed memory.
|
|
if (auto *active = dynamic_cast<OracleWizardPage *>(currentPage())) {
|
|
active->cancelWork();
|
|
}
|
|
QWizard::reject();
|
|
}
|
|
|
|
void OracleWizard::runInBackground()
|
|
{
|
|
backgroundMode = true;
|
|
hide();
|
|
currentPage()->initializePage();
|
|
}
|
|
|
|
void OracleWizard::startRaiseServer()
|
|
{
|
|
// Scope the socket name to the current user, mirroring the hosting client.
|
|
raiseServer = new QLocalServer(this);
|
|
connect(raiseServer, &QLocalServer::newConnection, this, &OracleWizard::handleRaiseRequest);
|
|
const QString serverName = scopedLocalServerName(QStringLiteral("CockatriceOracleRaise"));
|
|
if (raiseServer->listen(serverName)) {
|
|
return;
|
|
}
|
|
// A stale socket left behind by a crashed run holds the name: take it back.
|
|
QLocalServer::removeServer(serverName);
|
|
if (!raiseServer->listen(serverName)) {
|
|
qWarning() << "Oracle: could not listen for raise requests on" << serverName;
|
|
delete raiseServer;
|
|
raiseServer = nullptr;
|
|
}
|
|
}
|
|
|
|
void OracleWizard::handleRaiseRequest()
|
|
{
|
|
while (raiseServer && raiseServer->hasPendingConnections()) {
|
|
QLocalSocket *socket = raiseServer->nextPendingConnection();
|
|
connect(socket, &QLocalSocket::readyRead, this, [this, socket]() {
|
|
socket->readAll();
|
|
socket->deleteLater();
|
|
raiseWizard();
|
|
});
|
|
connect(socket, &QLocalSocket::disconnected, socket, &QLocalSocket::deleteLater);
|
|
}
|
|
raiseWizard();
|
|
}
|
|
|
|
void OracleWizard::raiseWizard()
|
|
{
|
|
// An ongoing background run is hidden; the user asked to see it, so promote it to a window.
|
|
if (backgroundMode && !isVisible()) {
|
|
show();
|
|
}
|
|
if (isMinimized()) {
|
|
showNormal();
|
|
}
|
|
raise();
|
|
activateWindow();
|
|
if (windowHandle()) {
|
|
windowHandle()->requestActivate();
|
|
}
|
|
}
|
|
|
|
void OracleWizard::enableButtons()
|
|
{
|
|
button(QWizard::NextButton)->setDisabled(false);
|
|
button(QWizard::BackButton)->setDisabled(false);
|
|
}
|
|
|
|
void OracleWizard::disableButtons()
|
|
{
|
|
button(QWizard::NextButton)->setDisabled(true);
|
|
button(QWizard::BackButton)->setDisabled(true);
|
|
}
|
|
|
|
bool OracleWizard::saveTokensToFile(const QString &fileName)
|
|
{
|
|
QFile file(fileName);
|
|
if (!file.open(QIODevice::WriteOnly)) {
|
|
qDebug() << "File open (w) failed for" << fileName;
|
|
return false;
|
|
}
|
|
|
|
if (file.write(tokensData) == -1) {
|
|
qDebug() << "File write (w) failed for" << fileName;
|
|
return false;
|
|
}
|
|
|
|
file.close();
|
|
return true;
|
|
}
|