Allow more naming schemes for custom pictures (#6021)

* Allow more naming schemes for custom pictures.

Order is cardName_providerId, cardName_setName_collectorNumber, setName-collectorNumber-cardName and then just generically cardName, if the user has decided to override every printing. Most-to-least specific.


Took 2 minutes

Took 8 seconds

* Fixups.

Took 2 minutes

* Even more naming schemes.

Took 6 minutes

* Finally yeet the bug warning in PrintingSelector

Took 3 minutes

* Adjust to PrintingInfo change.

Took 5 minutes

* Don't use suffixes.

Took 7 minutes

Took 9 seconds

* Comments.

Took 2 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp

@@ -11,13 +11,10 @@ static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
 
 PictureLoaderLocal::PictureLoaderLocal(QObject *parent)
     : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
-      customPicsPath(SettingsCache::instance().getCustomPicsPath()),
+      customPicsPath(SettingsCache::instance().getCustomPicsPath())
-      overrideAllCardArtWithPersonalPreference(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference())
 {
     // Hook up signals to settings
     connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoaderLocal::picsPathChanged);
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
-            &PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference);
 
     refreshIndex();
 
@@ -59,84 +56,94 @@ QImage PictureLoaderLocal::tryLoad(const CardInfoPtr &toLoad) const
 {
     CardSetPtr set = PictureToLoad::extractSetsSorted(toLoad).first();
 
-    QString setName = set ? set->getCorrectedShortName() : QString();
+    PrintingInfo setInstance = CardDatabaseManager::getInstance()->getSetInfoForCard(toLoad);
+
     QString cardName = toLoad->getName();
     QString correctedCardName = toLoad->getCorrectedName();
 
-    // FIXME: This is a hack so that to keep old Cockatrice behavior
+    QString setName, collectorNumber, providerId;
-    // (ignoring provider ID) when the "override all card art with personal
+
-    // preference" is set.
+    if (setInstance.getSet()) {
-    //
+        setName = setInstance.getSet()->getCorrectedShortName();
-    // Figure out a proper way to integrate the two systems at some point.
+        collectorNumber = setInstance.getProperty("num");
-    //
+        providerId = setInstance.getProperty("uuid");
-    // Note: need to go through a member for
-    // overrideAllCardArtWithPersonalPreference as reading from the
-    // SettingsCache instance from the PictureLoaderWorker thread could
-    // cause race conditions.
-    //
-    // XXX: Reading from the CardDatabaseManager instance from the
-    // PictureLoaderWorker thread might not be safe either
-    bool searchCustomPics =
-        overrideAllCardArtWithPersonalPreference ||
-        CardDatabaseManager::getInstance()->isProviderIdForPreferredPrinting(cardName, toLoad->getPixmapCacheKey());
-    if (searchCustomPics) {
-        qCDebug(PictureLoaderLocalLog).nospace()
-            << "[card: " << cardName << " set: " << setName << "]: Attempting to load picture from local";
-        return tryLoadCardImageFromDisk(setName, correctedCardName, searchCustomPics);
     }
 
     qCDebug(PictureLoaderLocalLog).nospace()
-        << "[card: " << cardName << " set: " << setName << "]: Skipping load picture from local";
+        << "[card: " << cardName << " set: " << setName << "]: Attempting to load picture from local";
-
+    return tryLoadCardImageFromDisk(setName, correctedCardName, collectorNumber, providerId);
-    return QImage();
 }
 
 QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
                                                     const QString &correctedCardName,
-                                                    const bool searchCustomPics) const
+                                                    const QString &collectorNumber,
+                                                    const QString &providerId) const
 {
     QImage image;
     QImageReader imgReader;
     imgReader.setDecideFormatFromContent(true);
-    QList<QString> picsPaths = QList<QString>();
 
-    if (searchCustomPics) {
+    // Most-to-least specific, these will fall through in order.
-        picsPaths << customFolderIndex.values(correctedCardName);
+    QStringList nameVariants;
+
+    // cardName_providerId
+    if (!providerId.isEmpty()) {
+        nameVariants << QString("%1-%2").arg(correctedCardName, providerId)
+                     << QString("%1_%2").arg(correctedCardName, providerId);
     }
-
+    // cardName_setName_collectorNumber & setName-collectorNumber-cardName
+    if (!setName.isEmpty() && !collectorNumber.isEmpty()) {
+        nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber)
+                     << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName);
+    }
+    // cardName_setName
     if (!setName.isEmpty()) {
-        picsPaths << picsPath + "/" + setName + "/" + correctedCardName
+        nameVariants << QString("%1_%2").arg(correctedCardName, setName)
-                  // We no longer store downloaded images there, but don't just ignore
+                     << QString("%1-%2").arg(setName, correctedCardName);
-                  // stuff that old versions have put there.
-                  << picsPath + "/downloadedPics/" + setName + "/" + correctedCardName;
     }
 
-    // Iterates through the list of paths, searching for images with the desired
+    // cardName
-    // name with any QImageReader-supported extension
+    nameVariants << correctedCardName;
-    for (const auto &_picsPath : picsPaths) {
+
-        if (!QFileInfo(_picsPath).isFile()) {
+    for (const QString &nameVariant : nameVariants) {
+        if (nameVariant.isEmpty()) {
             continue;
         }
 
-        imgReader.setFileName(_picsPath);
+        QStringList candidatePaths = customFolderIndex.values(nameVariant);
-        if (imgReader.read(&image)) {
+
-            qCDebug(PictureLoaderLocalLog).nospace()
+        if (!setName.isEmpty()) {
-                << "[card: " << correctedCardName << " set: " << setName << "]: Picture found on disk.";
+            candidatePaths << picsPath + "/" + setName + "/" + nameVariant;
-            return image;
+            candidatePaths << picsPath + "/downloadedPics/" + setName + "/" + nameVariant;
         }
-        imgReader.setFileName(_picsPath + ".full");
+
-        if (imgReader.read(&image)) {
+        for (const QString &path : candidatePaths) {
-            qCDebug(PictureLoaderLocalLog).nospace()
+            QFileInfo fileInfo(path);
-                << "[card: " << correctedCardName << " set: " << setName << "]: Picture.full found on disk.";
+            QDir dir = fileInfo.dir();
-            return image;
+            QString baseName = fileInfo.fileName();
-        }
+
-        imgReader.setFileName(_picsPath + ".xlhq");
+            if (!dir.exists()) {
-        if (imgReader.read(&image)) {
+                continue;
-            qCDebug(PictureLoaderLocalLog).nospace()
+            }
-                << "[card: " << correctedCardName << " set: " << setName << "]: Picture.xlhq found on disk.";
+
-            return image;
+            QStringList files = dir.entryList(QDir::Files);
+            for (const QString &file : files) {
+                if (!file.startsWith(baseName)) {
+                    continue;
+                }
+
+                QString fullPath = dir.filePath(file);
+                imgReader.setFileName(fullPath);
+
+                if (imgReader.read(&image)) {
+                    qCDebug(PictureLoaderLocalLog).nospace()
+                        << "[card: " << correctedCardName << " set: " << setName << "] Found picture at: " << fullPath;
+                    return image;
+                }
+            }
         }
     }
+
     qCDebug(PictureLoaderLocalLog).nospace()
         << "[card: " << correctedCardName << " set: " << setName << "]: Picture NOT found on disk.";
     return QImage();
@@ -147,8 +154,3 @@ void PictureLoaderLocal::picsPathChanged()
     picsPath = SettingsCache::instance().getPicsPath();
     customPicsPath = SettingsCache::instance().getCustomPicsPath();
 }
-
-void PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference)
-{
-    overrideAllCardArtWithPersonalPreference = _overrideAllCardArtWithPersonalPreference;
-}

cockatrice/src/client/ui/picture_loader/picture_loader_local.h

@@ -24,19 +24,19 @@ public:
 
 private:
     QString picsPath, customPicsPath;
-    bool overrideAllCardArtWithPersonalPreference;
 
     QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths
     QTimer *refreshTimer;
 
     void refreshIndex();
 
-    QImage
+    QImage tryLoadCardImageFromDisk(const QString &setName,
-    tryLoadCardImageFromDisk(const QString &setName, const QString &correctedCardName, bool searchCustomPics) const;
+                                    const QString &correctedCardName,
+                                    const QString &collectorNumber,
+                                    const QString &providerId) const;
 
 private slots:
     void picsPathChanged();
-    void setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference);
 };
 
 #endif // PICTURE_LOADER_LOCAL_H

cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp

@@ -33,24 +33,6 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    if (PictureLoader::hasCustomArt()) {
-        QFrame *warningFrame = new QFrame(this);
-        warningFrame->setFrameShape(QFrame::StyledPanel);
-
-        warningLabel = new QLabel(this);
-        warningLabel->setTextFormat(Qt::RichText);
-        warningLabel->setWordWrap(true);
-
-        auto *warningLayout = new QVBoxLayout(warningFrame);
-        warningFrame->setLayout(warningLayout);
-
-        warningLayout->addWidget(warningLabel);
-
-        layout->addWidget(warningFrame);
-    } else {
-        warningLabel = nullptr;
-    }
-
     widgetLoadingBufferTimer = new QTimer(this);
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
@@ -107,12 +89,6 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 void PrintingSelector::retranslateUi()
 {
     navigationCheckBox->setText(tr("Display Navigation Buttons"));
-
-    if (warningLabel) {
-        warningLabel->setText(
-            tr("<b>Warning:</b> You appear to be using custom card art, which has known bugs when also "
-               "using the printing selector in this version of Cockatrice."));
-    }
 }
 
 void PrintingSelector::printingsInDeckChanged()

cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h

@@ -51,7 +51,6 @@ private:
     QWidget *sortAndOptionsContainer;
     QHBoxLayout *sortAndOptionsLayout;
     QCheckBox *navigationCheckBox;
-    QLabel *warningLabel;
     PrintingSelectorCardSortingWidget *sortToolBar;
     PrintingSelectorCardSearchWidget *searchBar;
     FlowWidget *flowWidget;