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

At least realize when we hit the rate limit and then back off for a time.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-24 12:44:59 +01:00
parent 93a98eca0c
commit 6d2f6b86be
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,18 +106,26 @@ void PictureLoaderWorker::handleRateLimit(QNetworkReply *reply, const QUrl &url,
{ {
QByteArray responseData = reply->readAll(); QByteArray responseData = reply->readAll();
QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData); QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData);
if (jsonDoc.isObject()) { if (jsonDoc.isObject()) {
QJsonObject jsonObj = jsonDoc.object(); QJsonObject jsonObj = jsonDoc.object();
if (jsonObj.value("object").toString() == "error" && jsonObj.value("code").toString() == "rate_limited") { if (jsonObj.value("object").toString() == "error" && jsonObj.value("code").toString() == "rate_limited") {
int retryAfter = 70; int retryAfter = 70; // Default retry delay
// Enable rate-limiting and queue the request // Prevent multiple rate-limit handling
rateLimited = true; if (!rateLimited) {
qWarning() << "Scryfall rate limit hit!"; rateLimited = true;
qWarning() << "Scryfall rate limit hit! Queuing requests for" << retryAfter << "seconds.";
// Start a timer to reset the rate-limited state
rateLimitTimer.singleShot(retryAfter * 1000, this, [this]() {
qWarning() << "Rate limit expired. Resuming queued requests.";
processQueuedRequests();
});
}
// Always queue the request even if already rate-limited
requestQueue.append(qMakePair(url, worker)); requestQueue.append(qMakePair(url, worker));
// Start a timer to reset rate-limiting
rateLimitTimer.singleShot(retryAfter * 1000, this, &PictureLoaderWorker::processQueuedRequests);
} }
} }
} }

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

@ -123,7 +123,6 @@ void PictureLoaderWorkerWork::picDownloadFailed()
<< (picDownload ? "download failed" : "downloads disabled") << (picDownload ? "download failed" : "downloads disabled")
<< ", no more url combinations to try: BAILING OUT"; << ", no more url combinations to try: BAILING OUT";
imageLoaded(cardToDownload.getCard(), QImage()); imageLoaded(cardToDownload.getCard(), QImage());
cardToDownload.clear();
} }
emit startLoadQueue(); emit startLoadQueue();
} }