From fc1d06e13b0b51b58129795c67aa18b80cc62f51 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 10 Nov 2014 00:23:41 +0100
Subject: [PATCH] Add fallback urls for cards without a muId set

We only have a good HQ source for them; any idea on a low-quality
source?
---
 cockatrice/src/carddatabase.cpp  | 14 ++++++++------
 cockatrice/src/settingscache.cpp | 14 ++++++++++++++
 cockatrice/src/settingscache.h   |  8 ++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index 25886d18..f34a0725 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -224,16 +224,18 @@ QString PictureLoader::getPicUrl()
             return picUrl;
     }
 
-    // otherwise, fallback to the default url
-    picUrl = picDownloadHq ? settingsCache->getPicUrlHq() : settingsCache->getPicUrl();
-    picUrl.replace("!name!", QUrl::toPercentEncoding(card->getCorrectedName()));
+    // if a card has a muid, use the default url; if not, use the fallback
+    int muid = set ? muid = card->getMuId(set->getShortName()) : 0;
+    if(muid)
+        picUrl = picDownloadHq ? settingsCache->getPicUrlHq() : settingsCache->getPicUrl();
+    else
+        picUrl = picDownloadHq ? settingsCache->getPicUrlHqFallback() : settingsCache->getPicUrlFallback();
 
+    picUrl.replace("!name!", QUrl::toPercentEncoding(card->getCorrectedName()));
+    picUrl.replace("!cardid!", QUrl::toPercentEncoding(QString::number(muid)));
     if (set) {
         picUrl.replace("!setcode!", QUrl::toPercentEncoding(set->getShortName()));
         picUrl.replace("!setname!", QUrl::toPercentEncoding(set->getLongName()));
-        int muid = card->getMuId(set->getShortName());
-        if (muid)
-            picUrl.replace("!cardid!", QUrl::toPercentEncoding(QString::number(muid)));
     }
 
     if (picUrl.contains("!name!") ||
diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp
index 5821d352..8374bdb5 100644
--- a/cockatrice/src/settingscache.cpp
+++ b/cockatrice/src/settingscache.cpp
@@ -25,6 +25,8 @@ SettingsCache::SettingsCache()
     picDownloadHq = settings->value("personal/picturedownloadhq", false).toBool();
     picUrl = settings->value("personal/picUrl", PIC_URL_DEFAULT).toString();
     picUrlHq = settings->value("personal/picUrlHq", PIC_URL_HQ_DEFAULT).toString();
+    picUrlFallback = settings->value("personal/picUrlFallback", PIC_URL_FALLBACK).toString();
+    picUrlHqFallback = settings->value("personal/picUrlHqFallback", PIC_URL_HQ_FALLBACK).toString();
 
     mainWindowGeometry = settings->value("interface/main_window_geometry").toByteArray();
     notificationsEnabled = settings->value("interface/notificationsenabled", true).toBool();
@@ -153,6 +155,18 @@ void SettingsCache::setPicUrlHq(const QString &_picUrlHq)
     settings->setValue("personal/picUrlHq", picUrlHq);
 }
 
+void SettingsCache::setPicUrlFallback(const QString &_picUrlFallback)
+{
+    picUrlFallback = _picUrlFallback;
+    settings->setValue("personal/picUrlFallback", picUrlFallback);
+}
+
+void SettingsCache::setPicUrlHqFallback(const QString &_picUrlHqFallback)
+{
+    picUrlHqFallback = _picUrlHqFallback;
+    settings->setValue("personal/picUrlHqFallback", picUrlHqFallback);
+}
+
 void SettingsCache::setNotificationsEnabled(int _notificationsEnabled)
 {
     notificationsEnabled = _notificationsEnabled;
diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h
index b222a58b..3b1908a9 100644
--- a/cockatrice/src/settingscache.h
+++ b/cockatrice/src/settingscache.h
@@ -4,7 +4,9 @@
 #include <QObject>
 
 #define PIC_URL_DEFAULT "http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!cardid!&type=card"
+#define PIC_URL_FALLBACK "http://mtgimage.com/set/!setcode!/!name!.jpg"
 #define PIC_URL_HQ_DEFAULT "http://mtgimage.com/multiverseid/!cardid!.jpg"
+#define PIC_URL_HQ_FALLBACK "http://mtgimage.com/set/!setcode!/!name!.jpg"
 
 class QSettings;
 
@@ -57,6 +59,8 @@ private:
     bool ignoreUnregisteredUsers;
     QString picUrl;
     QString picUrlHq;
+    QString picUrlFallback;
+    QString picUrlHqFallback;
     bool attemptAutoConnect;
 public:
     SettingsCache();
@@ -93,6 +97,8 @@ public:
     bool getIgnoreUnregisteredUsers() const { return ignoreUnregisteredUsers; }
     QString getPicUrl() const { return picUrl; }
     QString getPicUrlHq() const { return picUrlHq; }
+    QString getPicUrlFallback() const { return picUrlFallback; }
+    QString getPicUrlHqFallback() const { return picUrlHqFallback; }
     void copyPath(const QString &src, const QString &dst);
     bool getAutoConnect() const { return attemptAutoConnect; }
 public slots:
@@ -129,6 +135,8 @@ public slots:
     void setIgnoreUnregisteredUsers(bool _ignoreUnregisteredUsers);
     void setPicUrl(const QString &_picUrl);
     void setPicUrlHq(const QString &_picUrlHq);
+    void setPicUrlFallback(const QString &_picUrlFallback);
+    void setPicUrlHqFallback(const QString &_picUrlHqFallback);
     void setAutoConnect(const bool &_autoConnect);
 };