From ee4ff6e7321fc00812ce5c23e2df45b7e42afe50 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Tue, 15 Jul 2025 05:07:03 +0200 Subject: [PATCH] Allow more naming schemes for custom pictures (#6021) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- .../picture_loader/picture_loader_local.cpp | 126 +++++++++--------- .../ui/picture_loader/picture_loader_local.h | 8 +- .../printing_selector/printing_selector.cpp | 24 ---- .../printing_selector/printing_selector.h | 1 - 4 files changed, 68 insertions(+), 91 deletions(-) diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp index 0b8d48995..648906960 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp +++ b/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()), - overrideAllCardArtWithPersonalPreference(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) + customPicsPath(SettingsCache::instance().getCustomPicsPath()) { // 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 - // (ignoring provider ID) when the "override all card art with personal - // preference" is set. - // - // Figure out a proper way to integrate the two systems at some point. - // - // 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); + QString setName, collectorNumber, providerId; + + if (setInstance.getSet()) { + setName = setInstance.getSet()->getCorrectedShortName(); + collectorNumber = setInstance.getProperty("num"); + providerId = setInstance.getProperty("uuid"); } qCDebug(PictureLoaderLocalLog).nospace() - << "[card: " << cardName << " set: " << setName << "]: Skipping load picture from local"; - - return QImage(); + << "[card: " << cardName << " set: " << setName << "]: Attempting to load picture from local"; + return tryLoadCardImageFromDisk(setName, correctedCardName, collectorNumber, providerId); } 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 picsPaths = QList(); - if (searchCustomPics) { - picsPaths << customFolderIndex.values(correctedCardName); + // Most-to-least specific, these will fall through in order. + 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 - // We no longer store downloaded images there, but don't just ignore - // stuff that old versions have put there. - << picsPath + "/downloadedPics/" + setName + "/" + correctedCardName; + nameVariants << QString("%1_%2").arg(correctedCardName, setName) + << QString("%1-%2").arg(setName, correctedCardName); } - // Iterates through the list of paths, searching for images with the desired - // name with any QImageReader-supported extension - for (const auto &_picsPath : picsPaths) { - if (!QFileInfo(_picsPath).isFile()) { + // cardName + nameVariants << correctedCardName; + + for (const QString &nameVariant : nameVariants) { + if (nameVariant.isEmpty()) { continue; } - imgReader.setFileName(_picsPath); - if (imgReader.read(&image)) { - qCDebug(PictureLoaderLocalLog).nospace() - << "[card: " << correctedCardName << " set: " << setName << "]: Picture found on disk."; - return image; + QStringList candidatePaths = customFolderIndex.values(nameVariant); + + if (!setName.isEmpty()) { + candidatePaths << picsPath + "/" + setName + "/" + nameVariant; + candidatePaths << picsPath + "/downloadedPics/" + setName + "/" + nameVariant; } - imgReader.setFileName(_picsPath + ".full"); - if (imgReader.read(&image)) { - qCDebug(PictureLoaderLocalLog).nospace() - << "[card: " << correctedCardName << " set: " << setName << "]: Picture.full found on disk."; - return image; - } - imgReader.setFileName(_picsPath + ".xlhq"); - if (imgReader.read(&image)) { - qCDebug(PictureLoaderLocalLog).nospace() - << "[card: " << correctedCardName << " set: " << setName << "]: Picture.xlhq found on disk."; - return image; + + for (const QString &path : candidatePaths) { + QFileInfo fileInfo(path); + QDir dir = fileInfo.dir(); + QString baseName = fileInfo.fileName(); + + if (!dir.exists()) { + continue; + } + + 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; -} diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h b/cockatrice/src/client/ui/picture_loader/picture_loader_local.h index 45312d570..38b9fd0c3 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.h @@ -24,19 +24,19 @@ public: private: QString picsPath, customPicsPath; - bool overrideAllCardArtWithPersonalPreference; QMultiHash customFolderIndex; // multimap of cardName to picPaths QTimer *refreshTimer; void refreshIndex(); - QImage - tryLoadCardImageFromDisk(const QString &setName, const QString &correctedCardName, bool searchCustomPics) const; + QImage tryLoadCardImageFromDisk(const QString &setName, + const QString &correctedCardName, + const QString &collectorNumber, + const QString &providerId) const; private slots: void picsPathChanged(); - void setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference); }; #endif // PICTURE_LOADER_LOCAL_H diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp index 11bd87e19..978d67811 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp +++ b/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("Warning: 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() diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h index 388592208..f22dece93 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h +++ b/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;