gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-13 13:37:36 -08:00
Code Issues Packages Projects Releases Wiki Activity

save downloaded xmls (#4736)

Browse Source
This commit is contained in:
ebbit1q
2023-04-02 04:19:57 +02:00
committed by GitHub
parent 304ed3cd60
commit f5f8acf1fd
3 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
oracle/src/oraclewizard.cpp
View File

@@ -300,7 +300,7 @@ void LoadSetsPage::actLoadSetsFile()
bool LoadSetsPage::validatePage()
{
// once the import is finished, we call next(); skip validation
if (wizard()->importer->getSets().count() > 0) {
if (wizard()->downloadedPlainXml || wizard()->importer->getSets().count() > 0) {
return true;
}
@@ -354,7 +354,6 @@ bool LoadSetsPage::validatePage()
return false;
}
#include <iostream>
void LoadSetsPage::downloadSetsFile(const QUrl &url)
{
wizard()->setCardSourceVersion("unknown");
@@ -449,12 +448,20 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
progressLabel->show();
progressBar->show();
wizard()->downloadedPlainXml = false;
wizard()->xmlData.clear();
readSetsFromByteArrayRef(data);
}
void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
{
// unzip the file if needed
if (data.startsWith(XZ_SIGNATURE)) {
#ifdef HAS_LZMA
// zipped file
auto *inBuffer = new QBuffer(&data);
auto *outBuffer = new QBuffer(this);
auto newData = QByteArray();
auto *outBuffer = new QBuffer(&newData);
inBuffer->open(QBuffer::ReadOnly);
outBuffer->open(QBuffer::WriteOnly);
XzDecompressor xz;
@@ -462,11 +469,8 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
zipDownloadFailed(tr("Xz extraction failed."));
return;
}
const auto &outBufferData = outBuffer->data();
future = QtConcurrent::run(
[this, &outBufferData] { return wizard()->importer->readSetsFromByteArray(outBufferData); });
watcher.setFuture(future);
data.clear();
readSetsFromByteArrayRef(newData);
return;
#else
zipDownloadFailed(tr("Sorry, this version of Oracle does not support xz compressed files."));
@@ -481,7 +485,8 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
#ifdef HAS_ZLIB
// zipped file
auto *inBuffer = new QBuffer(&data);
auto *outBuffer = new QBuffer(this);
auto newData = QByteArray();
auto *outBuffer = new QBuffer(&newData);
QString fileName;
UnZip::ErrorCode ec;
UnZip uz;
@@ -505,11 +510,8 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
uz.closeArchive();
return;
}
const auto &outBufferData = outBuffer->data();
future = QtConcurrent::run(
[this, &outBufferData] { return wizard()->importer->readSetsFromByteArray(outBufferData); });
watcher.setFuture(future);
data.clear();
readSetsFromByteArrayRef(newData);
return;
#else
zipDownloadFailed(tr("Sorry, this version of Oracle does not support zipped files."));
@@ -520,10 +522,23 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
progressBar->hide();
return;
#endif
} else if (data.startsWith("{")) {
// Start the computation.
jsonData = std::move(data);
future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
watcher.setFuture(future);
} else if (data.startsWith("<")) {
// save xml file and don't do any processing
wizard()->downloadedPlainXml = true;
wizard()->xmlData = std::move(data);
importFinished();
} else {
wizard()->enableButtons();
setEnabled(true);
progressLabel->hide();
progressBar->hide();
QMessageBox::critical(this, tr("Error"), tr("Failed to interpret downloaded data."));
}
// Start the computation.
future = QtConcurrent::run([this, &data] { return wizard()->importer->readSetsFromByteArray(data); });
watcher.setFuture(future);
}
void LoadSetsPage::zipDownloadFailed(const QString &message)
@@ -553,7 +568,7 @@ void LoadSetsPage::importFinished()
progressLabel->hide();
progressBar->hide();
if (watcher.future().result()) {
if (wizard()->downloadedPlainXml || watcher.future().result()) {
wizard()->next();
} else {
QMessageBox::critical(this, tr("Error"),
@@ -590,6 +605,12 @@ void SaveSetsPage::initializePage()
{
messageLog->clear();
retranslateUi();
if (wizard()->downloadedPlainXml) {
messageLog->hide();
return;
}
messageLog->show();
connect(wizard()->importer, SIGNAL(setIndexChanged(int, int, const QString &)), this,
SLOT(updateTotalProgress(int, int, const QString &)));
@@ -601,7 +622,12 @@ void SaveSetsPage::initializePage()
void SaveSetsPage::retranslateUi()
{
setTitle(tr("Sets imported"));
setSubTitle(tr("The following sets have been found:"));
if (wizard()->downloadedPlainXml) {
setSubTitle(tr("A cockatrice database file of %1 MB has been downloaded.")
.arg(qRound(wizard()->xmlData.size() / 1000000.0)));
} else {
setSubTitle(tr("The following sets have been found:"));
}
saveLabel->setText(tr("Press \"Save\" to store the imported cards in the Cockatrice database."));
pathLabel->setText(tr("The card database will be saved at the following location:") + "<br>" +
@@ -646,7 +672,19 @@ bool SaveSetsPage::validatePage()
return false;
}
if (!wizard()->importer->saveToFile(fileName, wizard()->getCardSourceUrl(), wizard()->getCardSourceVersion())) {
if (wizard()->downloadedPlainXml) {
QFile file(fileName);
if (!file.open(QIODevice::WriteOnly)) {
qDebug() << "File write (w) failed for" << fileName;
return false;
}
if (file.write(wizard()->xmlData) < 1) {
qDebug() << "File write (w) failed for" << fileName;
return false;
}
wizard()->xmlData.clear();
} else if (!wizard()->importer->saveToFile(fileName, wizard()->getCardSourceUrl(),
wizard()->getCardSourceVersion())) {
QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName));
return false;
}