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

Don't use suffixes.

Browse source 
Took 7 minutes

Took 9 seconds
This commit is contained in:
Lukas Brübach 2025-07-13 11:13:29 +02:00
parent 019a7b9565
commit 7ef6ced763
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,25 +83,21 @@ 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)
nameVariants << 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) {
@ -109,12 +105,7 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
continue; continue;
} }
QStringList candidatePaths; QStringList candidatePaths = customFolderIndex.values(nameVariant);
const auto matches = customFolderIndex.values(nameVariant);
for (const QString &path : matches) {
candidatePaths << path;
}
if (!setName.isEmpty()) { if (!setName.isEmpty()) {
candidatePaths << picsPath + "/" + setName + "/" + nameVariant; candidatePaths << picsPath + "/" + setName + "/" + nameVariant;
@ -122,14 +113,23 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
} }
for (const QString &path : candidatePaths) { for (const QString &path : candidatePaths) {
for (const QString suffix : {"", ".full", ".xlhq"}) { QFileInfo fileInfo(path);
QString fullPath = path + suffix; QDir dir = fileInfo.dir();
QFileInfo fi(fullPath); QString baseName = fileInfo.fileName();
if (!fi.exists() || !fi.isFile()) {
if (!dir.exists()) {
continue;
}
QStringList files = dir.entryList(QDir::Files);
for (const QString &file : files) {
if (!file.startsWith(baseName)) {
continue; continue;
} }
QString fullPath = dir.filePath(file);
imgReader.setFileName(fullPath); imgReader.setFileName(fullPath);
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qCDebug(PictureLoaderLocalLog).nospace() qCDebug(PictureLoaderLocalLog).nospace()
<< "[card: " << correctedCardName << " set: " << setName << "] Found picture at: " << fullPath; << "[card: " << correctedCardName << " set: " << setName << "] Found picture at: " << fullPath;