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

2497: Start to implement fallback on card image urls

Browse source 
Return a list instead of a single url.  This is the start
of getting many possible urls instead of one.  Functionally
identical except that the primary url will be attempted for
cards without a muid.
This commit is contained in:
Andrew Zwicky 2018-08-05 16:21:53 -05:00
parent f1eab4e26a
commit 846b426a7c
1 changed files with 51 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
cockatrice/src/pictureloader.cpp
View file

@ -197,51 +197,70 @@ bool PictureLoaderWorker::cardImageExistsOnDisk(QString &setName, QString &corre
return false; return false;
} }
QString PictureLoaderWorker::getPicUrl() QList<QString> PictureLoaderWorker::getAllPicUrls()
{ {
if (!picDownload) if (!picDownload)
return QString(); return QList<QString>();
CardInfoPtr card = cardBeingDownloaded.getCard(); CardInfoPtr card = cardBeingDownloaded.getCard();
CardSetPtr set = cardBeingDownloaded.getCurrentSet(); CardSetPtr set = cardBeingDownloaded.getCurrentSet();
QString picUrl = QString(""); QList<QString> urls = QList<QString>();
// if sets have been defined for the card, they can contain custom picUrls // if sets have been defined for the card, they can contain custom picUrls
if (set) { if (set) {
picUrl = card->getCustomPicURL(set->getShortName()); QString setCustomURL = card->getCustomPicURL(set->getShortName());
if (!picUrl.isEmpty())
return picUrl; if (!setCustomURL.isEmpty()) {
urls.append(setCustomURL);
return urls;
}
} }
// if a card has a muid, use the default url; if not, use the fallback // if a card has a muid, use the default url; if not, use the fallback
int muid = set ? card->getMuId(set->getShortName()) : 0; int muid = set ? card->getMuId(set->getShortName()) : 0;
picUrl = muid ? settingsCache->getPicUrl() : settingsCache->getPicUrlFallback();
picUrl.replace("!name!", QUrl::toPercentEncoding(card->getName())); QList<QString> urlArray = QList<QString>();
picUrl.replace("!name_lower!", QUrl::toPercentEncoding(card->getName().toLower())); urlArray.append(settingsCache->getPicUrl());
picUrl.replace("!corrected_name!", QUrl::toPercentEncoding(card->getCorrectedName())); urlArray.append(settingsCache->getPicUrlFallback());
picUrl.replace("!corrected_name_lower!", QUrl::toPercentEncoding(card->getCorrectedName().toLower()));
picUrl.replace("!cardid!", QUrl::toPercentEncoding(QString::number(muid))); for(int i=0; i < 2; i++) {
QString originalUrl = urlArray[i];
QString thisUrl = urlArray[i];
thisUrl.replace("!name!", QUrl::toPercentEncoding(card->getName()));
thisUrl.replace("!name_lower!", QUrl::toPercentEncoding(card->getName().toLower()));
thisUrl.replace("!corrected_name!", QUrl::toPercentEncoding(card->getCorrectedName()));
thisUrl.replace("!corrected_name_lower!", QUrl::toPercentEncoding(card->getCorrectedName().toLower()));
thisUrl.replace("!cardid!", QUrl::toPercentEncoding(QString::number(muid)));
if (set) { if (set) {
// renamed from !setnumber! to !collectornumber! on 20160819. Remove the old one when convenient. // renamed from !setnumber! to !collectornumber! on 20160819. Remove the old one when convenient.
picUrl.replace("!setnumber!", QUrl::toPercentEncoding(card->getCollectorNumber(set->getShortName()))); thisUrl.replace("!setnumber!", QUrl::toPercentEncoding(card->getCollectorNumber(set->getShortName())));
picUrl.replace("!collectornumber!", QUrl::toPercentEncoding(card->getCollectorNumber(set->getShortName()))); thisUrl.replace("!collectornumber!", QUrl::toPercentEncoding(card->getCollectorNumber(set->getShortName())));
picUrl.replace("!setcode!", QUrl::toPercentEncoding(set->getShortName())); thisUrl.replace("!setcode!", QUrl::toPercentEncoding(set->getShortName()));
picUrl.replace("!setcode_lower!", QUrl::toPercentEncoding(set->getShortName().toLower())); thisUrl.replace("!setcode_lower!", QUrl::toPercentEncoding(set->getShortName().toLower()));
picUrl.replace("!setname!", QUrl::toPercentEncoding(set->getLongName())); thisUrl.replace("!setname!", QUrl::toPercentEncoding(set->getLongName()));
picUrl.replace("!setname_lower!", QUrl::toPercentEncoding(set->getLongName().toLower())); thisUrl.replace("!setname_lower!", QUrl::toPercentEncoding(set->getLongName().toLower()));
} }
if (picUrl.contains("!name!") || picUrl.contains("!name_lower!") || picUrl.contains("!corrected_name!") || if (thisUrl.contains("!name!") ||
picUrl.contains("!corrected_name_lower!") || picUrl.contains("!setnumber!") || picUrl.contains("!setcode!") || thisUrl.contains("!name_lower!") ||
picUrl.contains("!setcode_lower!") || picUrl.contains("!setname!") || picUrl.contains("!setname_lower!") || thisUrl.contains("!corrected_name!") ||
picUrl.contains("!cardid!")) { thisUrl.contains("!corrected_name_lower!") ||
qDebug() << "Insufficient card data to download" << card->getName() << "Url:" << picUrl; thisUrl.contains("!setnumber!") ||
return QString(); thisUrl.contains("!setcode!") ||
thisUrl.contains("!setcode_lower!") ||
thisUrl.contains("!setname!") ||
thisUrl.contains("!setname_lower!") ||
thisUrl.contains("!cardid!")) {
qDebug() << "Insufficient card data to download" << card->getName() << "Url:" << originalUrl;
}
else {
urls.append(thisUrl);
} }
return picUrl; }
return urls;
} }
void PictureLoaderWorker::startNextPicDownload() void PictureLoaderWorker::startNextPicDownload()
@ -256,12 +275,12 @@ void PictureLoaderWorker::startNextPicDownload()
cardBeingDownloaded = cardsToDownload.takeFirst(); cardBeingDownloaded = cardsToDownload.takeFirst();
QString picUrl = getPicUrl(); QList<QString> picUrls = getAllPicUrls();
if (picUrl.isEmpty()) { if (picUrls.isEmpty()) {
downloadRunning = false; downloadRunning = false;
picDownloadFailed(); picDownloadFailed();
} else { } else {
QUrl url(picUrl); QUrl url(picUrls[0]); // For now, just use the first one, like always.
QNetworkRequest req(url); QNetworkRequest req(url);
qDebug() << "starting picture download:" << cardBeingDownloaded.getCard()->getName() << "Url:" << req.url(); qDebug() << "starting picture download:" << cardBeingDownloaded.getCard()->getName() << "Url:" << req.url();