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>
183 lines
4.5 KiB
C++
183 lines
4.5 KiB
C++
#ifndef COCKATRICE_PAGES_H
|
|
#define COCKATRICE_PAGES_H
|
|
|
|
#include "pagetemplates.h"
|
|
|
|
#include <QByteArray>
|
|
#include <QFuture>
|
|
#include <QFutureWatcher>
|
|
#include <QString>
|
|
#include <QTimer>
|
|
#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 IntroPage : public OracleWizardPage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit IntroPage(QWidget *parent = nullptr);
|
|
void retranslateUi() override;
|
|
|
|
private:
|
|
QStringList findQmFiles();
|
|
QString languageName(const QString &lang);
|
|
|
|
private:
|
|
QLabel *label, *languageLabel, *versionLabel;
|
|
QComboBox *languageBox;
|
|
|
|
private slots:
|
|
void languageBoxChanged(int index);
|
|
|
|
protected slots:
|
|
void initializePage() override;
|
|
};
|
|
|
|
class OutroPage : public OracleWizardPage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit OutroPage(QWidget * = nullptr)
|
|
{
|
|
}
|
|
void retranslateUi() override;
|
|
|
|
protected:
|
|
void initializePage() override;
|
|
};
|
|
|
|
/** @brief Result of a worker-thread sets-file load (read + decompress + dispatch). */
|
|
struct LoadSetsResult
|
|
{
|
|
bool ok = false; ///< JSON scan produced set data (or plain XML was handled)
|
|
bool plainXml = false; ///< input was a plain Cockatrice XML database
|
|
QByteArray xmlData; ///< raw XML for the plain-XML path
|
|
QString errorMessage; ///< set when the input could not be processed
|
|
bool offerUncompressedFallback = false; ///< decompression-only failure: offer the uncompressed URL
|
|
};
|
|
|
|
class LoadSetsPage : public OracleWizardPage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit LoadSetsPage(QWidget *parent = nullptr);
|
|
void retranslateUi() override;
|
|
bool isComplete() const override;
|
|
|
|
protected:
|
|
void initializePage() override;
|
|
bool validatePage() override;
|
|
void readSetsFromByteArray(QByteArray _data);
|
|
void readSetsFromFile(const QString &fileName);
|
|
void downloadSetsFile(const QUrl &url);
|
|
void cancelWork() override;
|
|
|
|
private:
|
|
QRadioButton *urlRadioButton;
|
|
QRadioButton *fileRadioButton;
|
|
QLineEdit *urlLineEdit;
|
|
QLineEdit *fileLineEdit;
|
|
QPushButton *urlButton;
|
|
QPushButton *fileButton;
|
|
QLabel *progressLabel;
|
|
QProgressBar *progressBar;
|
|
|
|
QFutureWatcher<LoadSetsResult> watcher;
|
|
QFuture<LoadSetsResult> future;
|
|
bool loadActive = false;
|
|
|
|
void beginLoadSets(bool compressedFile = false);
|
|
|
|
private slots:
|
|
void actLoadSetsFile();
|
|
void actRestoreDefaultUrl();
|
|
void actDownloadProgressSetsFile(qint64 received, qint64 total);
|
|
void actDownloadFinishedSetsFile();
|
|
void updateParsingProgress(int bytesRead, int totalBytes);
|
|
void scanProgressToStdout(int bytesRead, int totalBytes);
|
|
void importFinished();
|
|
void zipDownloadFailed(const QString &message);
|
|
};
|
|
|
|
class SaveSetsPage : public OracleWizardPage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit SaveSetsPage(QWidget *parent = nullptr);
|
|
void retranslateUi() override;
|
|
bool isComplete() const override;
|
|
|
|
private:
|
|
QTextEdit *messageLog;
|
|
QProgressBar *progressBar;
|
|
QCheckBox *defaultPathCheckBox;
|
|
QLabel *pathLabel;
|
|
QLabel *saveLabel;
|
|
|
|
QFutureWatcher<int> importWatcher;
|
|
QFuture<int> importFuture;
|
|
int totalSets = 0;
|
|
bool importActive = false;
|
|
|
|
protected:
|
|
void initializePage() override;
|
|
void cleanupPage() override;
|
|
bool validatePage() override;
|
|
void cancelWork() override;
|
|
|
|
private slots:
|
|
void importFinished();
|
|
void updateTotalProgress(int cardsImported, int setIndex, const QString &setName);
|
|
};
|
|
|
|
class LoadSpoilersPage : public SimpleDownloadFilePage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit LoadSpoilersPage(QWidget * = nullptr)
|
|
{
|
|
}
|
|
void retranslateUi() override;
|
|
|
|
protected:
|
|
QString getDefaultUrl() override;
|
|
QString getCustomUrlSettingsKey() override;
|
|
QString getDefaultSavePath() override;
|
|
QString getWindowTitle() override;
|
|
QString getFileType() override;
|
|
QString getFilePromptName() override;
|
|
};
|
|
|
|
class LoadTokensPage : public SimpleDownloadFilePage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit LoadTokensPage(QWidget * = nullptr)
|
|
{
|
|
}
|
|
void retranslateUi() override;
|
|
|
|
protected:
|
|
QString getDefaultUrl() override;
|
|
QString getCustomUrlSettingsKey() override;
|
|
QString getDefaultSavePath() override;
|
|
QString getWindowTitle() override;
|
|
QString getFileType() override;
|
|
QString getFilePromptName() override;
|
|
void initializePage() override;
|
|
};
|
|
|
|
#endif // COCKATRICE_PAGES_H
|