This commit is contained in:
Lukas Brübach 2025-01-13 22:53:43 +01:00
parent 85973caa03
commit 6089e3805c

View file

@ -41,7 +41,8 @@ bool PictureLoaderWorkerWork::cardImageExistsOnDisk(QString &setName, QString &c
QImageReader imgReader; QImageReader imgReader;
imgReader.setDecideFormatFromContent(true); imgReader.setDecideFormatFromContent(true);
QList<QString> picsPaths = QList<QString>(); QList<QString> picsPaths = QList<QString>();
QDirIterator it(SettingsCache::instance().getCustomPicsPath(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); QDirIterator it(SettingsCache::instance().getCustomPicsPath(),
QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
// Recursively check all subdirectories of the CUSTOM folder // Recursively check all subdirectories of the CUSTOM folder
while (it.hasNext()) { while (it.hasNext()) {
@ -75,15 +76,15 @@ bool PictureLoaderWorkerWork::cardImageExistsOnDisk(QString &setName, QString &c
} }
imgReader.setFileName(_picsPath + ".full"); imgReader.setFileName(_picsPath + ".full");
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qCDebug(PictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName qCDebug(PictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << correctedCardname
<< "]: Picture.full found on disk."; << " set: " << setName << "]: Picture.full found on disk.";
imageLoaded(cardToDownload.getCard(), image); imageLoaded(cardToDownload.getCard(), image);
return true; return true;
} }
imgReader.setFileName(_picsPath + ".xlhq"); imgReader.setFileName(_picsPath + ".xlhq");
if (imgReader.read(&image)) { if (imgReader.read(&image)) {
qCDebug(PictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << correctedCardname << " set: " << setName qCDebug(PictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << correctedCardname
<< "]: Picture.xlhq found on disk."; << " set: " << setName << "]: Picture.xlhq found on disk.";
imageLoaded(cardToDownload.getCard(), image); imageLoaded(cardToDownload.getCard(), image);
return true; return true;
} }
@ -175,9 +176,10 @@ void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply)
const QByteArray &picData = reply->peek(reply->size()); const QByteArray &picData = reply->peek(reply->size());
if (imageIsBlackListed(picData)) { if (imageIsBlackListed(picData)) {
qCDebug(PictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard()->getName() qCDebug(PictureLoaderWorkerWorkLog).nospace()
<< " set: " << cardToDownload.getSetName() << "PictureLoader: [card: " << cardToDownload.getCard()->getName()
<< "]: Picture found, but blacklisted, will consider it as not found"; << " set: " << cardToDownload.getSetName()
<< "]: Picture found, but blacklisted, will consider it as not found";
picDownloadFailed(); picDownloadFailed();
reply->deleteLater(); reply->deleteLater();