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

[PictureLoader] Reduce downtime between load attempts

Browse source
This commit is contained in:
RickyRister 2025-07-03 23:15:56 -07:00
parent 67a3b03b07
commit fd3467a14e
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
View file

@ -12,7 +12,10 @@
#include <QThread>
#include <utility>
PictureLoaderWorker::PictureLoaderWorker() : QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload())
static constexpr int MAX_REQUESTS_PER_SEC = 10;
PictureLoaderWorker::PictureLoaderWorker()
: QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestCounter(MAX_REQUESTS_PER_SEC)
{
networkManager = new QNetworkAccessManager(this);
// We need a timeout to ensure requests don't hang indefinitely in case of
@ -48,7 +51,7 @@ PictureLoaderWorker::PictureLoaderWorker() : QObject(nullptr), picDownload(Setti
connect(this, &PictureLoaderWorker::imageLoadEnqueued, this, &PictureLoaderWorker::handleImageLoadEnqueued);
connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::processQueuedRequests);
connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestCounter);
requestTimer.setInterval(1000);
requestTimer.start();
}
@ -70,6 +73,7 @@ void PictureLoaderWorker::queueRequest(const QUrl &url, PictureLoaderWorkerWork
} else {
requestLoadQueue.append(qMakePair(url, worker));
emit imageLoadQueued(url, worker);
processQueuedRequests();
}
}
@ -95,22 +99,31 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo
return reply;
}
void PictureLoaderWorker::resetRequestCounter()
{
requestCounter = MAX_REQUESTS_PER_SEC;
processQueuedRequests();
}
void PictureLoaderWorker::processQueuedRequests()
{
for (int i = 0; i < 10; i++) {
processSingleRequest();
while (requestCounter > 0 && processSingleRequest()) {
--requestCounter;
}
}
/**
* Immediately processes a single queued request
* Immediately processes a single queued request. No-ops if the load queue is empty
* @return If a request was processed
*/
void PictureLoaderWorker::processSingleRequest()
bool PictureLoaderWorker::processSingleRequest()
{
if (!requestLoadQueue.isEmpty()) {
auto request = requestLoadQueue.takeFirst();
makeRequest(request.first, request.second);
return true;
}
return false;
}
void PictureLoaderWorker::enqueueImageLoad(const CardInfoPtr &card)

7
cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
View file

@ -38,7 +38,7 @@ public:
public slots:
QNetworkReply *makeRequest(const QUrl &url, PictureLoaderWorkerWork *workThread);
void processQueuedRequests();
void processSingleRequest();
bool processSingleRequest();
void imageLoadedSuccessfully(const CardInfoPtr &card, const QImage &image);
void cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl);
void removedCachedUrl(const QUrl &url);
@ -52,7 +52,9 @@ private:
static constexpr int CacheTTLInDays = 30; // TODO: Make user configurable
bool picDownload;
QQueue<QPair<QUrl, PictureLoaderWorkerWork *>> requestLoadQueue;
QTimer requestTimer; // Timer for processing delayed requests
int requestCounter;
QTimer requestTimer; // Timer for refreshing request counter
PictureLoaderLocal *localLoader;
QSet<CardInfoPtr> currentlyLoading; // for deduplication purposes
@ -63,6 +65,7 @@ private:
void cleanStaleEntries();
private slots:
void resetRequestCounter();
void handleImageLoadEnqueued(const CardInfoPtr &card);
signals: