mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 09:05:10 -07:00
Some checks failed
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (actions) (push) Has been cancelled
Build Desktop / Configure (push) Has been cancelled
Build Docker / Servatrice (arm) (push) Has been cancelled
Build Docker / Servatrice (x86) (push) Has been cancelled
Build Desktop / Debian 13 (push) Has been cancelled
Build Desktop / Debian 12 (push) Has been cancelled
Build Desktop / Fedora 44 (push) Has been cancelled
Build Desktop / Fedora 43 (push) Has been cancelled
Build Desktop / Servatrice_Debian 12 (push) Has been cancelled
Build Desktop / Ubuntu 26.04 (push) Has been cancelled
Build Desktop / Ubuntu 24.04 (push) Has been cancelled
Build Desktop / Arch (push) Has been cancelled
Build Desktop / macOS 13 Intel (push) Has been cancelled
Build Desktop / macOS 14 (push) Has been cancelled
Build Desktop / macOS 15 (push) Has been cancelled
Build Desktop / macOS 26 Debug (push) Has been cancelled
Build Desktop / Windows 10 (push) Has been cancelled
Build Docker / Publish multi-platform Servatrice image (push) Has been cancelled
* [Oracle/Client] Report card database download progress Card database updates ran invisibly: MTGJSON parsing spun an indeterminate bar on the UI thread and the set import blocked the window, while the onboarding wizard spawned `oracle -b` with no progress to show at all. - Add byte-level scan progress to `RawJson::scanSetRanges` via an optional callback, throttled to ~100 reports per scan. - Emit `OracleImporter::dataReadProgress` during the scan and import sets on a worker thread, driving the wizard's progress bar per set. - With `-b`, write machine-readable `PROGRESS <stage> <done> <total>` lines to stdout for the download/scan/import stages; stderr keeps the log output. - Parse the oracle stdout in `MainWindow` and forward it to the onboarding wizard, giving the card database step a determinate bar with stage-specific status text. - Guard the async workers against the wizard being closed mid-run. - Add Google Test coverage for scan progress reporting. * [Oracle/Client] Harden oracle progress workers and quit prompt Address review feedback on the download-progress change: decompress and read sets files off the UI thread, cancel the load/import workers before the wizard can tear down the importer, and show an 'Extracting file...' status plus a clean 100% tail so the poll never looks stuck. Quitting Cockatrice while a card database update runs now asks for confirmation. * Show 100% for 500ms on complete. * Disable buttons on set import until done. * Clean up progress bar. * Drop wrapper around lambda --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
80 lines
1.6 KiB
C++
80 lines
1.6 KiB
C++
#ifndef ORACLEWIZARD_H
|
|
#define ORACLEWIZARD_H
|
|
|
|
#include <QWizard>
|
|
#include <utility>
|
|
|
|
class QCheckBox;
|
|
class QGroupBox;
|
|
class QComboBox;
|
|
class QLabel;
|
|
class QLineEdit;
|
|
class QRadioButton;
|
|
class QProgressBar;
|
|
class QNetworkAccessManager;
|
|
class QTextEdit;
|
|
class QVBoxLayout;
|
|
class OracleImporter;
|
|
class QSettings;
|
|
|
|
class OracleWizard : public QWizard
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit OracleWizard(QWidget *parent = nullptr);
|
|
void accept() override;
|
|
void reject() override;
|
|
void enableButtons();
|
|
void disableButtons();
|
|
void retranslateUi();
|
|
void setTokensData(QByteArray _tokensData)
|
|
{
|
|
tokensData = std::move(_tokensData);
|
|
}
|
|
bool hasTokensData()
|
|
{
|
|
return !tokensData.isEmpty();
|
|
}
|
|
void setCardSourceUrl(const QString &sourceUrl)
|
|
{
|
|
cardSourceUrl = sourceUrl;
|
|
}
|
|
void setCardSourceVersion(const QString &sourceVersion)
|
|
{
|
|
cardSourceVersion = sourceVersion;
|
|
}
|
|
const QString &getCardSourceUrl() const
|
|
{
|
|
return cardSourceUrl;
|
|
}
|
|
const QString &getCardSourceVersion() const
|
|
{
|
|
return cardSourceVersion;
|
|
}
|
|
bool saveTokensToFile(const QString &fileName);
|
|
|
|
void runInBackground();
|
|
|
|
public:
|
|
OracleImporter *importer;
|
|
QSettings *settings;
|
|
QNetworkAccessManager *nam;
|
|
bool downloadedPlainXml = false;
|
|
QByteArray xmlData;
|
|
bool backgroundMode = false;
|
|
|
|
private slots:
|
|
void updateLanguage();
|
|
|
|
private:
|
|
QByteArray tokensData;
|
|
QString cardSourceUrl;
|
|
QString cardSourceVersion;
|
|
|
|
void migrateOracleSettings();
|
|
|
|
protected:
|
|
void changeEvent(QEvent *event) override;
|
|
};
|
|
|
|
#endif
|