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

Make imageIsBlackListed static

Browse source
This commit is contained in:
RickyRister 2025-06-25 02:41:20 -07:00
parent e59f6d0553
commit 7a92a766dd
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
View file

@ -13,7 +13,7 @@
#include <QThread> #include <QThread>
// Card back returned by gatherer when card is not found // Card back returned by gatherer when card is not found
QStringList PictureLoaderWorkerWork::md5Blacklist = QStringList() << "db0c48db407a907c16ade38de048a441"; static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"};
PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const CardInfoPtr &toLoad) PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const CardInfoPtr &toLoad)
: QObject(nullptr), cardToDownload(toLoad), picDownload(SettingsCache::instance().getPicDownload()) : QObject(nullptr), cardToDownload(toLoad), picDownload(SettingsCache::instance().getPicDownload())
@ -78,6 +78,12 @@ void PictureLoaderWorkerWork::picDownloadFailed()
} }
} }
static bool imageIsBlackListed(const QByteArray &picData)
{
QString md5sum = QCryptographicHash::hash(picData, QCryptographicHash::Md5).toHex();
return MD5_BLACKLIST.contains(md5sum);
}
void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply) void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply)
{ {
bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool(); bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool();
@ -195,9 +201,3 @@ void PictureLoaderWorkerWork::picDownloadChanged()
{ {
picDownload = SettingsCache::instance().getPicDownload(); picDownload = SettingsCache::instance().getPicDownload();
} }
bool PictureLoaderWorkerWork::imageIsBlackListed(const QByteArray &picData)
{
QString md5sum = QCryptographicHash::hash(picData, QCryptographicHash::Md5).toHex();
return md5Blacklist.contains(md5sum);
}

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
View file

@ -34,7 +34,6 @@ public slots:
void picDownloadFailed(); void picDownloadFailed();
private: private:
static QStringList md5Blacklist;
QThread *pictureLoaderThread; QThread *pictureLoaderThread;
QNetworkAccessManager *networkManager; QNetworkAccessManager *networkManager;
bool picDownload, downloadRunning, loadQueueRunning; bool picDownload, downloadRunning, loadQueueRunning;
@ -42,7 +41,6 @@ private:
void startNextPicDownload(); void startNextPicDownload();
QImage tryLoadImageFromReply(QNetworkReply *reply); QImage tryLoadImageFromReply(QNetworkReply *reply);
void concludeImageLoad(const QImage &image); void concludeImageLoad(const QImage &image);
bool imageIsBlackListed(const QByteArray &);
private slots: private slots:
void picDownloadChanged(); void picDownloadChanged();