mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-22 09:35:08 -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>
82 lines
1.9 KiB
C++
82 lines
1.9 KiB
C++
#ifndef PAGETEMPLATES_H
|
|
#define PAGETEMPLATES_H
|
|
|
|
#include <QWizardPage>
|
|
|
|
class QFile;
|
|
class QRadioButton;
|
|
class OracleWizard;
|
|
class QCheckBox;
|
|
class QLabel;
|
|
class QLineEdit;
|
|
class QProgressBar;
|
|
|
|
class OracleWizardPage : public QWizardPage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit OracleWizardPage(QWidget *parent = nullptr) : QWizardPage(parent)
|
|
{
|
|
}
|
|
virtual void retranslateUi() = 0;
|
|
|
|
/**
|
|
* @brief Asks an active page to stop any background worker before the wizard
|
|
* (and its importer) can be torn down underneath it. Default is a no-op.
|
|
*/
|
|
virtual void cancelWork()
|
|
{
|
|
}
|
|
|
|
signals:
|
|
void readyToContinue();
|
|
|
|
protected:
|
|
inline OracleWizard *wizard()
|
|
{
|
|
return (OracleWizard *)QWizardPage::wizard();
|
|
}
|
|
};
|
|
|
|
class SimpleDownloadFilePage : public OracleWizardPage
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit SimpleDownloadFilePage(QWidget *parent = nullptr);
|
|
|
|
protected:
|
|
void initializePage() override;
|
|
bool validatePage() override;
|
|
void downloadFile(QUrl url);
|
|
virtual QString getDefaultUrl() = 0;
|
|
virtual QString getCustomUrlSettingsKey() = 0;
|
|
virtual QString getDefaultSavePath() = 0;
|
|
virtual QString getWindowTitle() = 0;
|
|
virtual QString getFileType() = 0;
|
|
virtual QString getFilePromptName() = 0;
|
|
bool saveToFile();
|
|
bool internalSaveToFile(const QString &fileName);
|
|
|
|
protected:
|
|
QByteArray downloadData;
|
|
QRadioButton *urlRadioButton;
|
|
QRadioButton *fileRadioButton;
|
|
QLineEdit *urlLineEdit;
|
|
QLineEdit *fileLineEdit;
|
|
QPushButton *urlButton;
|
|
QPushButton *fileButton;
|
|
QLabel *pathLabel;
|
|
QLabel *progressLabel;
|
|
QProgressBar *progressBar;
|
|
QCheckBox *defaultPathCheckBox;
|
|
|
|
signals:
|
|
void parsedDataReady();
|
|
private slots:
|
|
void actRestoreDefaultUrl();
|
|
void actLoadCardFile();
|
|
void actDownloadProgress(qint64 received, qint64 total);
|
|
void actDownloadFinished();
|
|
};
|
|
|
|
#endif // PAGETEMPLATES_H
|