diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index 6760e068..2e5c0ec7 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -132,7 +132,7 @@ void PictureLoader::processLoadQueue() } continue; } - + emit imageLoaded(ptl.getCard(), image); } } @@ -176,6 +176,10 @@ void PictureLoader::startNextPicDownload() void PictureLoader::picDownloadFinished(QNetworkReply *reply) { QString picsPath = _picsPath; + if (reply->error()) { + qDebug() << "Download failed:" << reply->errorString(); + } + const QByteArray &picData = reply->readAll(); QImage testImage; if (testImage.loadFromData(picData)) { @@ -189,17 +193,17 @@ void PictureLoader::picDownloadFinished(QNetworkReply *reply) QDir dir(QString(picsPath + "/downloadedPics")); dir.mkdir(cardBeingDownloaded.getSetName()); } - + QString suffix; if (!cardBeingDownloaded.getStripped()) suffix = ".full"; - + QFile newPic(picsPath + "/downloadedPics/" + cardBeingDownloaded.getSetName() + "/" + cardBeingDownloaded.getCard()->getCorrectedName() + suffix + ".jpg"); if (!newPic.open(QIODevice::WriteOnly)) return; newPic.write(picData); newPic.close(); - + emit imageLoaded(cardBeingDownloaded.getCard(), testImage); } else if (cardBeingDownloaded.getHq()) { qDebug() << "HQ: received invalid picture. URL:" << reply->request().url(); @@ -216,7 +220,7 @@ void PictureLoader::picDownloadFinished(QNetworkReply *reply) } else emit imageLoaded(cardBeingDownloaded.getCard(), QImage()); } - + reply->deleteLater(); startNextPicDownload(); } @@ -224,7 +228,7 @@ void PictureLoader::picDownloadFinished(QNetworkReply *reply) void PictureLoader::loadImage(CardInfo *card, bool stripped) { QMutexLocker locker(&mutex); - + loadQueue.append(PictureToLoad(card, stripped)); emit startLoadQueue(); } diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/carddatabase.h index bd3fd419..5e83080c 100644 --- a/cockatrice/src/carddatabase.h +++ b/cockatrice/src/carddatabase.h @@ -53,10 +53,8 @@ public: bool getStripped() const { return stripped; } QString getSetName() const { return sortedSets[setIndex]->getShortName(); } bool nextSet(); - bool getHq() const { return hq; } void setHq(bool _hq) { hq = _hq; } - }; class PictureLoader : public QObject {