mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 22:42:14 -07:00
rename some stuff
This commit is contained in:
parent
fd3467a14e
commit
4e80e57c2d
2 changed files with 12 additions and 9 deletions
|
|
@ -15,7 +15,7 @@
|
|||
static constexpr int MAX_REQUESTS_PER_SEC = 10;
|
||||
|
||||
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);
|
||||
// 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(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestCounter);
|
||||
connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestQuota);
|
||||
requestTimer.setInterval(1000);
|
||||
requestTimer.start();
|
||||
}
|
||||
|
|
@ -99,16 +99,19 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo
|
|||
return reply;
|
||||
}
|
||||
|
||||
void PictureLoaderWorker::resetRequestCounter()
|
||||
void PictureLoaderWorker::resetRequestQuota()
|
||||
{
|
||||
requestCounter = MAX_REQUESTS_PER_SEC;
|
||||
requestQuota = MAX_REQUESTS_PER_SEC;
|
||||
processQueuedRequests();
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps processing requests from the queue until the quota runs out or the request queue runs out.
|
||||
*/
|
||||
void PictureLoaderWorker::processQueuedRequests()
|
||||
{
|
||||
while (requestCounter > 0 && processSingleRequest()) {
|
||||
--requestCounter;
|
||||
while (requestQuota > 0 && processSingleRequest()) {
|
||||
--requestQuota;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ private:
|
|||
bool picDownload;
|
||||
QQueue<QPair<QUrl, PictureLoaderWorkerWork *>> requestLoadQueue;
|
||||
|
||||
int requestCounter;
|
||||
QTimer requestTimer; // Timer for refreshing request counter
|
||||
int requestQuota;
|
||||
QTimer requestTimer; // Timer for refreshing request quota
|
||||
|
||||
PictureLoaderLocal *localLoader;
|
||||
QSet<CardInfoPtr> currentlyLoading; // for deduplication purposes
|
||||
|
|
@ -65,7 +65,7 @@ private:
|
|||
void cleanStaleEntries();
|
||||
|
||||
private slots:
|
||||
void resetRequestCounter();
|
||||
void resetRequestQuota();
|
||||
void handleImageLoadEnqueued(const CardInfoPtr &card);
|
||||
|
||||
signals:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue