jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Comments.

Browse source 
Took 2 minutes
This commit is contained in:
Lukas Brübach 2025-07-13 11:25:39 +02:00
parent 7ef6ced763
commit ff7206d465
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
View file

@ -83,21 +83,26 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
QImageReader imgReader; QImageReader imgReader;
imgReader.setDecideFormatFromContent(true); imgReader.setDecideFormatFromContent(true);
// Most-to-least specific, these will fall through in order.
QStringList nameVariants; QStringList nameVariants;
// cardName_providerId
if (!providerId.isEmpty()) { if (!providerId.isEmpty()) {
nameVariants << QString("%1-%2").arg(correctedCardName, providerId) nameVariants << QString("%1-%2").arg(correctedCardName, providerId)
<< QString("%1_%2").arg(correctedCardName, providerId); << QString("%1_%2").arg(correctedCardName, providerId);
} }
// cardName_setName_collectorNumber & setName-collectorNumber-cardName
if (!setName.isEmpty() && !collectorNumber.isEmpty()) { if (!setName.isEmpty() && !collectorNumber.isEmpty()) {
nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber) nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber)
<< QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName); << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName);
} }
// cardName_setName
if (!setName.isEmpty()) { if (!setName.isEmpty()) {
nameVariants << QString("%1_%2").arg(correctedCardName, setName) nameVariants << QString("%1_%2").arg(correctedCardName, setName)
<< QString("%1-%2").arg(setName, correctedCardName); << QString("%1-%2").arg(setName, correctedCardName);
} }
// cardName
nameVariants << correctedCardName; nameVariants << correctedCardName;
for (const QString &nameVariant : nameVariants) { for (const QString &nameVariant : nameVariants) {