add _fill_with_ template notation to picture loader (#4287)

cockatrice/src/pictureloader.cpp

@@ -17,6 +17,7 @@
 #include <QNetworkRequest>
 #include <QPainter>
 #include <QPixmapCache>
+#include <QRegularExpression>
 #include <QSet>
 #include <QSvgRenderer>
 #include <QThread>
@@ -241,6 +242,10 @@ QString PictureToLoad::transformUrl(const QString &urlTemplate) const
        for downloading images.  If information is requested by the template that is
        not populated for this specific card/set combination, an empty string is returned.*/
 
+    static const QRegularExpression rxCardProp("!prop:([^!]+)!");
+    static const QRegularExpression rxFillWith("^(.+)_fill_with_(.+)$");
+    static const QRegularExpression rxSetProp("!set:([^!]+)!");
+
     QString transformedUrl = urlTemplate;
     CardSetPtr set = getCurrentSet();
 
@@ -252,18 +257,39 @@ QString PictureToLoad::transformUrl(const QString &urlTemplate) const
     transformMap["!corrected_name_lower!"] = card->getCorrectedName().toLower();
 
     // card properties
-    QRegExp rxCardProp("!prop:([^!]+)!");
+    auto matches = rxCardProp.globalMatch(transformedUrl);
-    int pos = 0;
+    while (matches.hasNext()) {
-    while ((pos = rxCardProp.indexIn(transformedUrl, pos)) != -1) {
+        auto match = matches.next();
-        QString propertyName = rxCardProp.cap(1);
+        QString propertyName = match.captured(1);
-        pos += rxCardProp.matchedLength();
+        auto fillMatch = rxFillWith.match(propertyName);
-        QString propertyValue = card->getProperty(propertyName);
+        QString fillPropertyName;
+        QString fillWith;
+        if (fillMatch.hasMatch()) {
+            fillPropertyName = fillMatch.captured(1);
+            fillWith = fillMatch.captured(2);
+        } else {
+            fillPropertyName = propertyName;
+            fillWith = QString();
+        }
+        QString propertyValue = card->getProperty(fillPropertyName);
         if (propertyValue.isEmpty()) {
             qDebug() << "PictureLoader: [card: " << card->getName() << " set: " << getSetName()
-                     << "]: Requested property (" << propertyName << ") for Url template (" << urlTemplate
+                     << "]: Requested property (" << fillPropertyName << ") for Url template (" << urlTemplate
                      << ") is not available";
             return QString();
         } else {
+            if (!fillWith.isEmpty()) {
+                int fillLength = fillWith.length();
+                int propLength = propertyValue.length();
+                if (fillLength < propLength) {
+                    qDebug() << "PictureLoader: [card: " << card->getName() << " set: " << getSetName()
+                             << "]: Requested property (" << fillPropertyName << ") for Url template (" << urlTemplate
+                             << ") is longer than fill specification (" << fillWith << ")";
+                    return QString();
+                } else {
+                    propertyValue = fillWith.left(fillLength - propLength) + propertyValue;
+                }
+            }
             transformMap["!prop:" + propertyName + "!"] = propertyValue;
         }
     }
@@ -274,18 +300,39 @@ QString PictureToLoad::transformUrl(const QString &urlTemplate) const
         transformMap["!setname!"] = set->getLongName();
         transformMap["!setname_lower!"] = set->getLongName().toLower();
 
-        QRegExp rxSetProp("!set:([^!]+)!");
+        auto matches = rxSetProp.globalMatch(transformedUrl);
-        pos = 0; // Defined above
+        while (matches.hasNext()) {
-        while ((pos = rxSetProp.indexIn(transformedUrl, pos)) != -1) {
+            auto match = matches.next();
-            QString propertyName = rxSetProp.cap(1);
+            QString propertyName = match.captured(1);
-            pos += rxSetProp.matchedLength();
+            auto fillMatch = rxFillWith.match(propertyName);
-            QString propertyValue = card->getSetProperty(set->getShortName(), propertyName);
+            QString fillPropertyName;
+            QString fillWith;
+            if (fillMatch.hasMatch()) {
+                fillPropertyName = fillMatch.captured(1);
+                fillWith = fillMatch.captured(2);
+            } else {
+                fillPropertyName = propertyName;
+                fillWith = QString();
+            }
+            QString propertyValue = card->getSetProperty(set->getShortName(), fillPropertyName);
             if (propertyValue.isEmpty()) {
                 qDebug() << "PictureLoader: [card: " << card->getName() << " set: " << getSetName()
-                         << "]: Requested set property (" << propertyName << ") for Url template (" << urlTemplate
+                         << "]: Requested set property (" << fillPropertyName << ") for Url template (" << urlTemplate
                          << ") is not available";
                 return QString();
             } else {
+                if (!fillWith.isEmpty()) {
+                    int fillLength = fillWith.length();
+                    int propLength = propertyValue.length();
+                    if (fillLength < propLength) {
+                        qDebug() << "PictureLoader: [card: " << card->getName() << " set: " << getSetName()
+                                 << "]: Requested set property (" << fillPropertyName << ") for Url template ("
+                                 << urlTemplate << ") is longer than fill specification (" << fillWith << ")";
+                        return QString();
+                    } else {
+                        propertyValue = fillWith.left(fillLength - propLength) + propertyValue;
+                    }
+                }
                 transformMap["!set:" + propertyName + "!"] = propertyValue;
             }
         }
@@ -405,10 +452,9 @@ void PictureLoaderWorker::picDownloadFinished(QNetworkReply *reply)
     QImageReader imgReader;
     imgReader.setDecideFormatFromContent(true);
     imgReader.setDevice(reply);
-    QString extension = "." + imgReader.format(); // the format is determined
+    // the format is determined prior to reading the QImageReader data into a QImage object, as that wipes the
-                                                  // prior to reading the
+    // QImageReader buffer
-                                                  // QImageReader data
+    QString extension = "." + imgReader.format();
-    // into a QImage object, as that wipes the QImageReader buffer
     if (extension == ".jpeg") {
         extension = ".jpg";
     }