aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't use corrected name when downloading card (#2164)

Browse source
This commit is contained in:
ctrlaltca 2016-10-23 01:07:58 +02:00 committed by Zach H
parent 2dd7158802
commit b808d3824b
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cockatrice/src/pictureloader.cpp
View file

@ -133,14 +133,15 @@ void PictureLoaderWorker::processLoadQueue()
mutex.unlock(); mutex.unlock();
QString setName = cardBeingLoaded.getSetName(); QString setName = cardBeingLoaded.getSetName();
QString correctedCardname = cardBeingLoaded.getCard()->getCorrectedName(); QString cardName = cardBeingLoaded.getCard()->getName();
qDebug() << "Trying to load picture (set: " << setName << " card: " << correctedCardname << ")"; QString correctedCardName = cardBeingLoaded.getCard()->getCorrectedName();
qDebug() << "Trying to load picture (set: " << setName << " card: " << cardName << ")";
if(cardImageExistsOnDisk(setName, correctedCardname)) if(cardImageExistsOnDisk(setName, correctedCardName))
continue; continue;
if (picDownload) { if (picDownload) {
qDebug() << "Picture NOT found, trying to download (set: " << setName << " card: " << correctedCardname << ")"; qDebug() << "Picture NOT found, trying to download (set: " << setName << " card: " << cardName << ")";
cardsToDownload.append(cardBeingLoaded); cardsToDownload.append(cardBeingLoaded);
cardBeingLoaded=0; cardBeingLoaded=0;
if (!downloadRunning) if (!downloadRunning)
@ -148,13 +149,13 @@ void PictureLoaderWorker::processLoadQueue()
} else { } else {
if (cardBeingLoaded.nextSet()) if (cardBeingLoaded.nextSet())
{ {
qDebug() << "Picture NOT found and download disabled, moving to next set (newset: " << setName << " card: " << correctedCardname << ")"; qDebug() << "Picture NOT found and download disabled, moving to next set (newset: " << setName << " card: " << cardName << ")";
mutex.lock(); mutex.lock();
loadQueue.prepend(cardBeingLoaded); loadQueue.prepend(cardBeingLoaded);
cardBeingLoaded=0; cardBeingLoaded=0;
mutex.unlock(); mutex.unlock();
} else { } else {
qDebug() << "Picture NOT found, download disabled, no more sets to try: BAILING OUT (oldset: " << setName << " card: " << correctedCardname << ")"; qDebug() << "Picture NOT found, download disabled, no more sets to try: BAILING OUT (oldset: " << setName << " card: " << cardName << ")";
imageLoaded(cardBeingLoaded.getCard(), QImage()); imageLoaded(cardBeingLoaded.getCard(), QImage());
} }
} }
@ -180,13 +181,13 @@ bool PictureLoaderWorker::cardImageExistsOnDisk(QString & setName, QString & cor
for (int i = 0; i < picsPaths.length(); i ++) { for (int i = 0; i < picsPaths.length(); i ++) {
imgReader.setFileName(picsPaths.at(i)); imgReader.setFileName(picsPaths.at(i));
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qDebug() << "Picture found on disk (set: " << setName << " card: " << correctedCardname << ")"; qDebug() << "Picture found on disk (set: " << setName << " file: " << correctedCardname << ")";
imageLoaded(cardBeingLoaded.getCard(), image); imageLoaded(cardBeingLoaded.getCard(), image);
return true; return true;
} }
imgReader.setFileName(picsPaths.at(i) + ".full"); imgReader.setFileName(picsPaths.at(i) + ".full");
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qDebug() << "Picture.full found on disk (set: " << setName << " card: " << correctedCardname << ")"; qDebug() << "Picture.full found on disk (set: " << setName << " file: " << correctedCardname << ")";
imageLoaded(cardBeingLoaded.getCard(), image); imageLoaded(cardBeingLoaded.getCard(), image);
return true; return true;
} }
@ -215,8 +216,8 @@ QString PictureLoaderWorker::getPicUrl()
int muid = set ? card->getMuId(set->getShortName()) : 0; int muid = set ? card->getMuId(set->getShortName()) : 0;
picUrl = muid ? settingsCache->getPicUrl() : settingsCache->getPicUrlFallback(); picUrl = muid ? settingsCache->getPicUrl() : settingsCache->getPicUrlFallback();
picUrl.replace("!name!", QUrl::toPercentEncoding(card->getCorrectedName())); picUrl.replace("!name!", QUrl::toPercentEncoding(card->getName()));
picUrl.replace("!name_lower!", QUrl::toPercentEncoding(card->getCorrectedName().toLower())); picUrl.replace("!name_lower!", QUrl::toPercentEncoding(card->getName().toLower()));
picUrl.replace("!cardid!", QUrl::toPercentEncoding(QString::number(muid))); picUrl.replace("!cardid!", QUrl::toPercentEncoding(QString::number(muid)));
if (set) if (set)
{ {
@ -277,12 +278,12 @@ void PictureLoaderWorker::picDownloadFailed()
{ {
if (cardBeingDownloaded.nextSet()) if (cardBeingDownloaded.nextSet())
{ {
qDebug() << "Picture NOT found, download failed, moving to next set (newset: " << cardBeingDownloaded.getSetName() << " card: " << cardBeingDownloaded.getCard()->getCorrectedName() << ")"; qDebug() << "Picture NOT found, download failed, moving to next set (newset: " << cardBeingDownloaded.getSetName() << " card: " << cardBeingDownloaded.getCard()->getName() << ")";
mutex.lock(); mutex.lock();
loadQueue.prepend(cardBeingDownloaded); loadQueue.prepend(cardBeingDownloaded);
mutex.unlock(); mutex.unlock();
} else { } else {
qDebug() << "Picture NOT found, download failed, no more sets to try: BAILING OUT (oldset: " << cardBeingDownloaded.getSetName() << " card: " << cardBeingDownloaded.getCard()->getCorrectedName() << ")"; qDebug() << "Picture NOT found, download failed, no more sets to try: BAILING OUT (oldset: " << cardBeingDownloaded.getSetName() << " card: " << cardBeingDownloaded.getCard()->getName() << ")";
imageLoaded(cardBeingDownloaded.getCard(), QImage()); imageLoaded(cardBeingDownloaded.getCard(), QImage());
cardBeingDownloaded = 0; cardBeingDownloaded = 0;
} }