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

rename some stuff

Browse source
This commit is contained in:
RickyRister 2025-07-04 20:19:11 -07:00
parent fd3467a14e
commit 4e80e57c2d
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
static constexpr int MAX_REQUESTS_PER_SEC = 10; static constexpr int MAX_REQUESTS_PER_SEC = 10;
PictureLoaderWorker::PictureLoaderWorker() PictureLoaderWorker::PictureLoaderWorker()
: QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestCounter(MAX_REQUESTS_PER_SEC) : QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestQuota(MAX_REQUESTS_PER_SEC)
{ {
networkManager = new QNetworkAccessManager(this); networkManager = new QNetworkAccessManager(this);
// We need a timeout to ensure requests don't hang indefinitely in case of // We need a timeout to ensure requests don't hang indefinitely in case of
@ -51,7 +51,7 @@ PictureLoaderWorker::PictureLoaderWorker()
connect(this, &PictureLoaderWorker::imageLoadEnqueued, this, &PictureLoaderWorker::handleImageLoadEnqueued); connect(this, &PictureLoaderWorker::imageLoadEnqueued, this, &PictureLoaderWorker::handleImageLoadEnqueued);
connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestCounter); connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestQuota);
requestTimer.setInterval(1000); requestTimer.setInterval(1000);
requestTimer.start(); requestTimer.start();
} }
@ -99,16 +99,19 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo
return reply; return reply;
} }
void PictureLoaderWorker::resetRequestCounter() void PictureLoaderWorker::resetRequestQuota()
{ {
requestCounter = MAX_REQUESTS_PER_SEC; requestQuota = MAX_REQUESTS_PER_SEC;
processQueuedRequests(); processQueuedRequests();
} }
/**
* Keeps processing requests from the queue until the quota runs out or the request queue runs out.
*/
void PictureLoaderWorker::processQueuedRequests() void PictureLoaderWorker::processQueuedRequests()
{ {
while (requestCounter > 0 && processSingleRequest()) { while (requestQuota > 0 && processSingleRequest()) {
--requestCounter; --requestQuota;
} }
} }

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

@ -53,8 +53,8 @@ private:
bool picDownload; bool picDownload;
QQueue<QPair<QUrl, PictureLoaderWorkerWork *>> requestLoadQueue; QQueue<QPair<QUrl, PictureLoaderWorkerWork *>> requestLoadQueue;
int requestCounter; int requestQuota;
QTimer requestTimer; // Timer for refreshing request counter QTimer requestTimer; // Timer for refreshing request quota
PictureLoaderLocal *localLoader; PictureLoaderLocal *localLoader;
QSet<CardInfoPtr> currentlyLoading; // for deduplication purposes QSet<CardInfoPtr> currentlyLoading; // for deduplication purposes
@ -65,7 +65,7 @@ private:
void cleanStaleEntries(); void cleanStaleEntries();
private slots: private slots:
void resetRequestCounter(); void resetRequestQuota();
void handleImageLoadEnqueued(const CardInfoPtr &card); void handleImageLoadEnqueued(const CardInfoPtr &card);
signals: signals: