mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-27 00:14:40 -07:00
Compare commits
7 commits
7b82ca08da
...
b3b930587b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b3b930587b | ||
|
|
21ca53962d | ||
|
|
d6dea73be5 | ||
|
|
ab72ba8132 | ||
|
|
310caa7dc0 | ||
|
|
5956dcab83 | ||
|
|
91519166f9 |
9 changed files with 489 additions and 45 deletions
|
|
@ -16,15 +16,15 @@
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <version_string.h>
|
#include <version_string.h>
|
||||||
|
|
||||||
static constexpr int MAX_REQUESTS_PER_SEC = 10;
|
static constexpr int MAX_REQUESTS_PER_SEC = DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT;
|
||||||
static constexpr int MIN_HOST_QUOTA = 1; ///< Floor for the per-host request allowance
|
static constexpr int MIN_HOST_QUOTA = DownloadSettings::MIN_HOST_REQUEST_LIMIT;
|
||||||
static constexpr qint64 QUOTA_RECOVER_MS = 60000; ///< Idle time before a reduced quota starts recovering
|
static constexpr qint64 QUOTA_RECOVER_MS = 60000; ///< Idle time before a reduced quota starts recovering
|
||||||
static constexpr int DISPATCH_INTERVAL_MS = 100; ///< Pacing between individual network requests
|
static constexpr int DISPATCH_INTERVAL_MS = 100; ///< Pacing between individual network requests
|
||||||
static constexpr qint64 QUOTA_RESET_INTERVAL_MS = 1000; ///< Interval at which the request quota resets
|
static constexpr qint64 QUOTA_RESET_INTERVAL_MS = 1000; ///< Interval at which the request quota resets
|
||||||
|
|
||||||
CardPictureLoaderWorker::CardPictureLoaderWorker()
|
CardPictureLoaderWorker::CardPictureLoaderWorker()
|
||||||
: QObject(nullptr), picDownload(SettingsCache::instance().downloads().getPicDownload()),
|
: QObject(nullptr), picDownload(SettingsCache::instance().downloads().getPicDownload()),
|
||||||
requestQuota(MAX_REQUESTS_PER_SEC)
|
hostRequestLimits(SettingsCache::instance().downloads().getHostRequestLimits())
|
||||||
{
|
{
|
||||||
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
|
||||||
|
|
@ -74,6 +74,9 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
|
||||||
|
|
||||||
connect(&dispatchTimer, &QTimer::timeout, this, &CardPictureLoaderWorker::dispatchQueuedRequest);
|
connect(&dispatchTimer, &QTimer::timeout, this, &CardPictureLoaderWorker::dispatchQueuedRequest);
|
||||||
dispatchTimer.setInterval(DISPATCH_INTERVAL_MS);
|
dispatchTimer.setInterval(DISPATCH_INTERVAL_MS);
|
||||||
|
|
||||||
|
connect(&SettingsCache::instance().downloads(), &DownloadSettings::hostRequestLimitsChanged, this,
|
||||||
|
[this] { hostRequestLimits = SettingsCache::instance().downloads().getHostRequestLimits(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
CardPictureLoaderWorker::~CardPictureLoaderWorker()
|
CardPictureLoaderWorker::~CardPictureLoaderWorker()
|
||||||
|
|
@ -109,6 +112,14 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
|
||||||
QUrl cachedRedirect = getCachedRedirect(url);
|
QUrl cachedRedirect = getCachedRedirect(url);
|
||||||
if (!cachedRedirect.isEmpty()) {
|
if (!cachedRedirect.isEmpty()) {
|
||||||
emit imageRequestSucceeded(url);
|
emit imageRequestSucceeded(url);
|
||||||
|
// The redirect target is a different host, which may itself be in 429 backoff; hand the
|
||||||
|
// entry back to its worker so it waits the backoff out instead of dispatching straight
|
||||||
|
// onto the backed-off host.
|
||||||
|
if (CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(cachedRedirect.host(),
|
||||||
|
QDateTime::currentDateTime())) {
|
||||||
|
worker->scheduleDeferredRetry();
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
return makeRequest(cachedRedirect, worker);
|
return makeRequest(cachedRedirect, worker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -129,26 +140,45 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
|
||||||
|
|
||||||
QNetworkReply *reply = networkManager->get(req);
|
QNetworkReply *reply = networkManager->get(req);
|
||||||
|
|
||||||
|
// Track in-flight replies per host so the unlocked fast path can bound how many requests it
|
||||||
|
// issues at once, instead of creating replies that time out before Qt opens a connection.
|
||||||
|
const QString host = url.host();
|
||||||
|
hostInFlight.insert(host, hostInFlight.value(host) + 1);
|
||||||
|
|
||||||
// Connect reply handling
|
// Connect reply handling
|
||||||
connect(reply, &QNetworkReply::finished, worker, [reply, worker] { worker->handleNetworkReply(reply); });
|
connect(reply, &QNetworkReply::finished, worker, [this, reply, worker, host] {
|
||||||
|
hostInFlight.insert(host, qMax(0, hostInFlight.value(host) - 1));
|
||||||
|
worker->handleNetworkReply(reply);
|
||||||
|
});
|
||||||
|
|
||||||
return reply;
|
return reply;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CardPictureLoaderWorker::resetRequestQuota()
|
void CardPictureLoaderWorker::resetRequestQuota()
|
||||||
{
|
{
|
||||||
requestQuota = MAX_REQUESTS_PER_SEC;
|
// Allowances are seeded lazily per host in processSingleRequest() when a request is first
|
||||||
|
// looked at in a new second, so a host that enters the queue mid-second now gets its reduced
|
||||||
|
// per-host allowance instead of falling through to the full per-second default.
|
||||||
|
hostQuotaRemaining.clear();
|
||||||
|
|
||||||
QDateTime now = QDateTime::currentDateTime();
|
QDateTime now = QDateTime::currentDateTime();
|
||||||
for (auto it = hostRequestQuota.begin(); it != hostRequestQuota.end(); ++it) {
|
for (auto it = hostRequestQuota.begin(); it != hostRequestQuota.end();) {
|
||||||
if (!hostLast429.contains(it.key()) || now.msecsTo(hostLast429.value(it.key())) < -QUOTA_RECOVER_MS) {
|
if (!hostLast429.contains(it.key()) || now.msecsTo(hostLast429.value(it.key())) < -QUOTA_RECOVER_MS) {
|
||||||
it.value() = qMin(MAX_REQUESTS_PER_SEC, it.value() + 1);
|
if (hostAllowanceCeiling(it.key()) == DownloadSettings::UNLIMITED_HOST_QUOTA) {
|
||||||
|
// A developer-unlocked host that fell back after a 429 recovers towards the default
|
||||||
|
// allowance; once it gets there it becomes unlocked (fast-path) again.
|
||||||
|
if (it.value() + 1 >= DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT) {
|
||||||
|
it = hostRequestQuota.erase(it);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
it.value() += 1;
|
||||||
|
} else {
|
||||||
|
// Recover towards the host's effective allowance ceiling, which may be
|
||||||
|
// lowered by the user's per-host request limits.
|
||||||
|
it.value() = qMin(hostAllowanceCeiling(it.key()), it.value() + 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
++it;
|
||||||
|
|
||||||
for (const auto &request : requestLoadQueue) {
|
|
||||||
const QString host = request.first.host();
|
|
||||||
hostQuotaRemaining.insert(host, hostRequestQuota.value(host, MAX_REQUESTS_PER_SEC));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processQueuedRequests();
|
processQueuedRequests();
|
||||||
|
|
@ -156,38 +186,112 @@ void CardPictureLoaderWorker::resetRequestQuota()
|
||||||
|
|
||||||
void CardPictureLoaderWorker::processQueuedRequests()
|
void CardPictureLoaderWorker::processQueuedRequests()
|
||||||
{
|
{
|
||||||
|
Q_ASSERT(thread() == QThread::currentThread());
|
||||||
|
|
||||||
if (requestLoadQueue.isEmpty()) {
|
if (requestLoadQueue.isEmpty()) {
|
||||||
dispatchTimer.stop();
|
dispatchTimer.stop();
|
||||||
|
requestTimer.stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Start lazily from the worker's own thread: QTimer must be started in the thread it lives in.
|
// Start lazily from the worker's own thread: QTimer must be started in the thread it lives in.
|
||||||
if (!requestTimer.isActive()) {
|
if (!requestTimer.isActive()) {
|
||||||
requestTimer.start();
|
requestTimer.start();
|
||||||
}
|
}
|
||||||
dispatchTimer.start();
|
// Restarting an active timer would reset the pacing countdown, so a burst of enqueues could
|
||||||
|
// keep starving the dispatcher; only start it when it has actually stopped.
|
||||||
|
if (!dispatchTimer.isActive()) {
|
||||||
|
dispatchTimer.start();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CardPictureLoaderWorker::dispatchQueuedRequest()
|
void CardPictureLoaderWorker::dispatchQueuedRequest()
|
||||||
{
|
{
|
||||||
if (requestLoadQueue.isEmpty() || requestQuota <= 0) {
|
if (requestLoadQueue.isEmpty()) {
|
||||||
|
// All queued requests have been dispatched; stop the pacing and quota-reset timers.
|
||||||
dispatchTimer.stop();
|
dispatchTimer.stop();
|
||||||
|
requestTimer.stop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QDateTime now = QDateTime::currentDateTime();
|
||||||
|
bool dispatched = false;
|
||||||
|
// Set while an unlocked host still has queued work blocked only by the in-flight cap; the
|
||||||
|
// timer must keep running so it gets another try as soon as a slot frees. A host blocked by
|
||||||
|
// its 429 backoff instead waits for the next quota-reset tick to restart the dispatcher.
|
||||||
|
bool unlockedCapped = false;
|
||||||
|
|
||||||
|
// Unlocked hosts (developer cap UNLIMITED_HOST_QUOTA) skip the pacing and the per-host
|
||||||
|
// allowance: dispatch their queued requests back-to-back, bounded by their 429 backoff and the
|
||||||
|
// per-host in-flight cap so a large burst can't queue replies that time out before Qt opens a
|
||||||
|
// connection for them.
|
||||||
|
for (int i = 0; i < requestLoadQueue.size();) {
|
||||||
|
const auto &request = requestLoadQueue.at(i);
|
||||||
|
const QString host = request.first.host();
|
||||||
|
if (isUnlockedHost(host)) {
|
||||||
|
if (CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(host, now)) {
|
||||||
|
++i;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (hostInFlight.value(host) < MAX_IN_FLIGHT_PER_HOST) {
|
||||||
|
makeRequest(request.first, request.second);
|
||||||
|
requestLoadQueue.removeAt(i);
|
||||||
|
dispatched = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
unlockedCapped = true;
|
||||||
|
}
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestLoadQueue.isEmpty()) {
|
||||||
|
dispatchTimer.stop();
|
||||||
|
requestTimer.stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (processSingleRequest()) {
|
if (processSingleRequest()) {
|
||||||
--requestQuota;
|
dispatched = true;
|
||||||
} else {
|
}
|
||||||
// No queued host currently has allowance left in this second; wait for the quota reset.
|
|
||||||
|
// Keep the timer running while there is progress to make or unlocked work waiting on a free
|
||||||
|
// in-flight slot; otherwise no host has allowance left this second, so wait for the quota reset.
|
||||||
|
if (!dispatched && !unlockedCapped) {
|
||||||
dispatchTimer.stop();
|
dispatchTimer.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CardPictureLoaderWorker::processSingleRequest()
|
bool CardPictureLoaderWorker::processSingleRequest()
|
||||||
{
|
{
|
||||||
|
QDateTime now = QDateTime::currentDateTime();
|
||||||
for (int i = 0; i < requestLoadQueue.size(); ++i) {
|
for (int i = 0; i < requestLoadQueue.size(); ++i) {
|
||||||
const auto &request = requestLoadQueue.at(i);
|
const auto &request = requestLoadQueue.at(i);
|
||||||
QString host = request.first.host();
|
const QString host = request.first.host();
|
||||||
int allowance = hostQuotaRemaining.value(host, MAX_REQUESTS_PER_SEC);
|
// Don't dispatch requests to a host that is currently in its 429 backoff; hand the entry
|
||||||
|
// back to its worker so it can wait the backoff out or fall through to another source,
|
||||||
|
// instead of leaving it parked in the queue with no reply pending.
|
||||||
|
if (CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(host, now)) {
|
||||||
|
requestLoadQueue.removeAt(i);
|
||||||
|
request.second->startNextPicDownload();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// Unlocked hosts are handled by dispatchQueuedRequest's fast path, bounded by the in-flight
|
||||||
|
// cap; they must not fall through to the per-host allowance arithmetic below.
|
||||||
|
if (isUnlockedHost(host)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int ceiling = hostAllowanceCeiling(host);
|
||||||
|
if (ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA) {
|
||||||
|
// A 429 dropped this unlocked host out of the fast path and installed a concrete
|
||||||
|
// allowance; pace it against that allowance until the recovery loop unlocks it again.
|
||||||
|
ceiling = hostRequestQuota.value(host, DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT);
|
||||||
|
}
|
||||||
|
// Seed the allowance lazily so a host that enters the queue mid-second gets its reduced
|
||||||
|
// per-host allowance, clamped against the ceiling so a lowered user cap applies from this
|
||||||
|
// second onward.
|
||||||
|
if (!hostQuotaRemaining.contains(host)) {
|
||||||
|
hostQuotaRemaining.insert(host, qMin(ceiling, hostRequestQuota.value(host, ceiling)));
|
||||||
|
}
|
||||||
|
int allowance = hostQuotaRemaining.value(host);
|
||||||
if (allowance > 0) {
|
if (allowance > 0) {
|
||||||
hostQuotaRemaining.insert(host, allowance - 1);
|
hostQuotaRemaining.insert(host, allowance - 1);
|
||||||
makeRequest(request.first, request.second);
|
makeRequest(request.first, request.second);
|
||||||
|
|
@ -198,9 +302,30 @@ bool CardPictureLoaderWorker::processSingleRequest()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CardPictureLoaderWorker::hostAllowanceCeiling(const QString &host) const
|
||||||
|
{
|
||||||
|
const int devCap = DownloadSettings::getDeveloperHostCaps().value(host, MAX_REQUESTS_PER_SEC);
|
||||||
|
if (devCap == DownloadSettings::UNLIMITED_HOST_QUOTA && !hostRequestLimits.contains(host)) {
|
||||||
|
return DownloadSettings::UNLIMITED_HOST_QUOTA;
|
||||||
|
}
|
||||||
|
const int requested = hostRequestLimits.value(host, devCap);
|
||||||
|
return SettingsCache::instance().downloads().clampHostRequestLimit(host, requested);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CardPictureLoaderWorker::isUnlockedHost(const QString &host) const
|
||||||
|
{
|
||||||
|
return hostAllowanceCeiling(host) == DownloadSettings::UNLIMITED_HOST_QUOTA && !hostRequestQuota.contains(host);
|
||||||
|
}
|
||||||
|
|
||||||
void CardPictureLoaderWorker::onHostRateLimited(const QString &host)
|
void CardPictureLoaderWorker::onHostRateLimited(const QString &host)
|
||||||
{
|
{
|
||||||
hostRequestQuota.insert(host, qMax(MIN_HOST_QUOTA, hostRequestQuota.value(host, MAX_REQUESTS_PER_SEC) / 2));
|
const int ceiling = hostAllowanceCeiling(host);
|
||||||
|
// An unlocked host has no per-host allowance to halve. Install one instead so it drops out of
|
||||||
|
// the unlocked fast path and is paced like a throttled host; the recovery loop in
|
||||||
|
// resetRequestQuota() then walks it back up and unlocks it again.
|
||||||
|
const int base =
|
||||||
|
ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA ? DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT : ceiling;
|
||||||
|
hostRequestQuota.insert(host, qMax(MIN_HOST_QUOTA, hostRequestQuota.value(host, base) / 2));
|
||||||
hostLast429.insert(host, QDateTime::currentDateTime());
|
hostLast429.insert(host, QDateTime::currentDateTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ public slots:
|
||||||
*/
|
*/
|
||||||
QNetworkReply *makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *workThread);
|
QNetworkReply *makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *workThread);
|
||||||
|
|
||||||
/** @brief Processes all queued requests respecting the request quota. */
|
/** @brief Starts the pacing timers if there is queued work, stops them when the queue is empty. */
|
||||||
void processQueuedRequests();
|
void processQueuedRequests();
|
||||||
|
|
||||||
/** @brief Chooses a request from the queue and starts it, respecting the quota and pacing. */
|
/** @brief Chooses a request from the queue and starts it, respecting the quota and pacing. */
|
||||||
|
|
@ -121,16 +121,36 @@ private:
|
||||||
bool picDownload; ///< Whether downloading images from network is enabled
|
bool picDownload; ///< Whether downloading images from network is enabled
|
||||||
QQueue<QPair<QUrl, CardPictureLoaderWorkerWork *>> requestLoadQueue; ///< Queue of pending network requests
|
QQueue<QPair<QUrl, CardPictureLoaderWorkerWork *>> requestLoadQueue; ///< Queue of pending network requests
|
||||||
|
|
||||||
int requestQuota; ///< Remaining requests allowed per second
|
|
||||||
QTimer requestTimer; ///< Timer to reset the request quota
|
QTimer requestTimer; ///< Timer to reset the request quota
|
||||||
QTimer dispatchTimer; ///< Timer pacing individual network requests
|
QTimer dispatchTimer; ///< Timer pacing individual network requests
|
||||||
QHash<QString, int> hostRequestQuota; ///< Sustained per-host request allowance
|
QHash<QString, int> hostRequestQuota; ///< Sustained per-host request allowance
|
||||||
|
QHash<QString, int> hostRequestLimits; ///< User-set per-host request allowances
|
||||||
QHash<QString, int> hostQuotaRemaining; ///< Per-host allowance left in the current second
|
QHash<QString, int> hostQuotaRemaining; ///< Per-host allowance left in the current second
|
||||||
QHash<QString, QDateTime> hostLast429; ///< When each host was last rate limited
|
QHash<QString, QDateTime> hostLast429; ///< When each host was last rate limited
|
||||||
|
QHash<QString, int> hostInFlight; ///< Network replies currently in flight, per host
|
||||||
|
|
||||||
|
/** @brief Maximum concurrent in-flight network replies per host. */
|
||||||
|
static constexpr int MAX_IN_FLIGHT_PER_HOST = 6;
|
||||||
|
|
||||||
CardPictureLoaderLocal *localLoader; ///< Loader for local images
|
CardPictureLoaderLocal *localLoader; ///< Loader for local images
|
||||||
QSet<QString> currentlyLoading; ///< Deduplication: contains pixmapCacheKey currently being loaded
|
QSet<QString> currentlyLoading; ///< Deduplication: contains pixmapCacheKey currently being loaded
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Effective per-host allowance ceiling for a host.
|
||||||
|
* @param host The host to look up
|
||||||
|
* @return The allowance ceiling in requests/second, or DownloadSettings::UNLIMITED_HOST_QUOTA
|
||||||
|
* when the developer unlocked the host and no user limit is set for it.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] int hostAllowanceCeiling(const QString &host) const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Whether a host may skip dispatch pacing and per-host allowance entirely.
|
||||||
|
*
|
||||||
|
* A host is unlocked while it has no user limit and no reduced allowance installed by a 429.
|
||||||
|
* A 429 drops it out of the fast path until resetRequestQuota() walks the allowance back up.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] bool isUnlockedHost(const QString &host) const;
|
||||||
|
|
||||||
/** @brief Returns cached redirect URL for the given original URL, if available. */
|
/** @brief Returns cached redirect URL for the given original URL, if available. */
|
||||||
[[nodiscard]] QUrl getCachedRedirect(const QUrl &originalUrl) const;
|
[[nodiscard]] QUrl getCachedRedirect(const QUrl &originalUrl) const;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,11 @@ static const QStringList MD5_BLACKLIST = {
|
||||||
"fbc7d763c08771c260b39e2115414eeb" // Current card back hash
|
"fbc7d763c08771c260b39e2115414eeb" // Current card back hash
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const ServerRateLimiter &CardPictureLoaderWorkerWork::rateLimiter()
|
||||||
|
{
|
||||||
|
return s_rateLimiter;
|
||||||
|
}
|
||||||
|
|
||||||
CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad)
|
CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad)
|
||||||
: QObject(nullptr), cardToDownload(CardPictureToLoad(toLoad)),
|
: QObject(nullptr), cardToDownload(CardPictureToLoad(toLoad)),
|
||||||
picDownload(SettingsCache::instance().downloads().getPicDownload())
|
picDownload(SettingsCache::instance().downloads().getPicDownload())
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,29 @@ public:
|
||||||
|
|
||||||
CardPictureToLoad cardToDownload; ///< The card and associated URLs to try downloading
|
CardPictureToLoad cardToDownload; ///< The card and associated URLs to try downloading
|
||||||
|
|
||||||
|
/** @brief Shared per-server 429 backoff state. */
|
||||||
|
static const ServerRateLimiter &rateLimiter();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Starts downloading the next URL for this card.
|
||||||
|
*
|
||||||
|
* Skips URLs whose server is currently in 429 backoff, either waiting the
|
||||||
|
* backoff out or falling through to the other configured sources. Also used by
|
||||||
|
* the dispatch machinery to hand an entry back after it was removed from the
|
||||||
|
* request queue when its host turned out to be backed off.
|
||||||
|
*/
|
||||||
|
void startNextPicDownload();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Schedules a deferred retry after the relevant server backoff expires.
|
||||||
|
*
|
||||||
|
* Waits on the current URL's server when it is the reason we are blocked,
|
||||||
|
* otherwise on the earliest active backoff. If no servers are in backoff,
|
||||||
|
* concludes with failure. Otherwise resets the CardPictureToLoad indices and
|
||||||
|
* retries after the backoff period.
|
||||||
|
*/
|
||||||
|
void scheduleDeferredRetry();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
/**
|
/**
|
||||||
* @brief Handles a finished network reply for the card image.
|
* @brief Handles a finished network reply for the card image.
|
||||||
|
|
@ -55,9 +78,6 @@ private:
|
||||||
|
|
||||||
static ServerRateLimiter s_rateLimiter; ///< Shared per-server 429 backoff state
|
static ServerRateLimiter s_rateLimiter; ///< Shared per-server 429 backoff state
|
||||||
|
|
||||||
/** @brief Starts downloading the next URL for this card. */
|
|
||||||
void startNextPicDownload();
|
|
||||||
|
|
||||||
/** @brief Called when all URLs have been exhausted or download failed. */
|
/** @brief Called when all URLs have been exhausted or download failed. */
|
||||||
void picDownloadFailed();
|
void picDownloadFailed();
|
||||||
|
|
||||||
|
|
@ -82,16 +102,6 @@ private:
|
||||||
*/
|
*/
|
||||||
void concludeImageLoad(const QImage &image);
|
void concludeImageLoad(const QImage &image);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Schedules a deferred retry after the relevant server backoff expires.
|
|
||||||
*
|
|
||||||
* Waits on the current URL's server when it is the reason we are blocked,
|
|
||||||
* otherwise on the earliest active backoff. If no servers are in backoff,
|
|
||||||
* concludes with failure. Otherwise resets the CardPictureToLoad indices and
|
|
||||||
* retries after the backoff period.
|
|
||||||
*/
|
|
||||||
void scheduleDeferredRetry();
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
/** @brief Updates the picDownload setting when it changes. */
|
/** @brief Updates the picDownload setting when it changes. */
|
||||||
void picDownloadChanged();
|
void picDownloadChanged();
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,9 @@
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
#include <QSet>
|
||||||
#include <QToolBar>
|
#include <QToolBar>
|
||||||
|
#include <QUrl>
|
||||||
#include <libcockatrice/settings/download_settings.h>
|
#include <libcockatrice/settings/download_settings.h>
|
||||||
#include <libcockatrice/settings/paths_settings.h>
|
#include <libcockatrice/settings/paths_settings.h>
|
||||||
#include <libcockatrice/settings/personal_settings.h>
|
#include <libcockatrice/settings/personal_settings.h>
|
||||||
|
|
@ -51,7 +53,9 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
|
||||||
urlList->setDragDropMode(QAbstractItemView::InternalMove);
|
urlList->setDragDropMode(QAbstractItemView::InternalMove);
|
||||||
connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged);
|
connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged);
|
||||||
|
|
||||||
urlList->addItems(SettingsCache::instance().downloads().getAllURLs());
|
for (const QString &url : SettingsCache::instance().downloads().getAllURLs()) {
|
||||||
|
addUrlItem(url);
|
||||||
|
}
|
||||||
|
|
||||||
aAdd = new QAction(this);
|
aAdd = new QAction(this);
|
||||||
aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
|
aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
|
||||||
|
|
@ -65,11 +69,16 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
|
||||||
aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement")));
|
aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement")));
|
||||||
connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL);
|
connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL);
|
||||||
|
|
||||||
|
aRateLimit = new QAction(this);
|
||||||
|
aRateLimit->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
|
||||||
|
connect(aRateLimit, &QAction::triggered, this, &DeckEditorSettingsPage::actAdjustRateLimit);
|
||||||
|
|
||||||
auto *urlToolBar = new QToolBar;
|
auto *urlToolBar = new QToolBar;
|
||||||
urlToolBar->setOrientation(Qt::Vertical);
|
urlToolBar->setOrientation(Qt::Vertical);
|
||||||
urlToolBar->addAction(aAdd);
|
urlToolBar->addAction(aAdd);
|
||||||
urlToolBar->addAction(aRemove);
|
urlToolBar->addAction(aRemove);
|
||||||
urlToolBar->addAction(aEdit);
|
urlToolBar->addAction(aEdit);
|
||||||
|
urlToolBar->addAction(aRateLimit);
|
||||||
urlToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
|
urlToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
|
||||||
|
|
||||||
auto *urlListLayout = new QHBoxLayout;
|
auto *urlListLayout = new QHBoxLayout;
|
||||||
|
|
@ -117,7 +126,9 @@ void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()
|
||||||
{
|
{
|
||||||
SettingsCache::instance().downloads().resetToDefaultURLs();
|
SettingsCache::instance().downloads().resetToDefaultURLs();
|
||||||
urlList->clear();
|
urlList->clear();
|
||||||
urlList->addItems(SettingsCache::instance().downloads().getAllURLs());
|
for (const QString &url : SettingsCache::instance().downloads().getAllURLs()) {
|
||||||
|
addUrlItem(url);
|
||||||
|
}
|
||||||
QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset."));
|
QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -126,7 +137,7 @@ void DeckEditorSettingsPage::actAddURL()
|
||||||
bool ok;
|
bool ok;
|
||||||
QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok);
|
QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok);
|
||||||
if (ok) {
|
if (ok) {
|
||||||
urlList->addItem(msg);
|
addUrlItem(msg);
|
||||||
storeSettings();
|
storeSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -141,12 +152,14 @@ void DeckEditorSettingsPage::actRemoveURL()
|
||||||
|
|
||||||
void DeckEditorSettingsPage::actEditURL()
|
void DeckEditorSettingsPage::actEditURL()
|
||||||
{
|
{
|
||||||
if (urlList->currentItem()) {
|
QListWidgetItem *item = urlList->currentItem();
|
||||||
QString oldText = urlList->currentItem()->text();
|
if (item) {
|
||||||
|
const QString oldText = urlForItem(item);
|
||||||
bool ok;
|
bool ok;
|
||||||
QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok);
|
QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok);
|
||||||
if (ok) {
|
if (ok) {
|
||||||
urlList->currentItem()->setText(msg);
|
item->setData(Qt::UserRole, msg);
|
||||||
|
item->setText(urlLabel(msg));
|
||||||
storeSettings();
|
storeSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -158,10 +171,128 @@ void DeckEditorSettingsPage::storeSettings()
|
||||||
|
|
||||||
QStringList downloadUrls;
|
QStringList downloadUrls;
|
||||||
for (int i = 0; i < urlList->count(); i++) {
|
for (int i = 0; i < urlList->count(); i++) {
|
||||||
qInfo() << "Priority" << i << ":" << urlList->item(i)->text();
|
const QString url = urlForItem(urlList->item(i));
|
||||||
downloadUrls << urlList->item(i)->text();
|
qInfo() << "Priority" << i << ":" << url;
|
||||||
|
downloadUrls << url;
|
||||||
}
|
}
|
||||||
SettingsCache::instance().downloads().setDownloadUrls(downloadUrls);
|
SettingsCache::instance().downloads().setDownloadUrls(downloadUrls);
|
||||||
|
|
||||||
|
// Drop per-host limits whose host is no longer referenced by any configured URL, so removing
|
||||||
|
// a URL doesn't leave a stale throttle behind that reactivates if the host is re-added.
|
||||||
|
QSet<QString> usedHosts;
|
||||||
|
for (const QString &url : downloadUrls) {
|
||||||
|
const QString host = QUrl(url).host();
|
||||||
|
if (!host.isEmpty()) {
|
||||||
|
usedHosts.insert(host);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QHash<QString, int> limits = SettingsCache::instance().downloads().getHostRequestLimits();
|
||||||
|
bool limitsChanged = false;
|
||||||
|
for (auto it = limits.begin(); it != limits.end();) {
|
||||||
|
if (!usedHosts.contains(it.key())) {
|
||||||
|
it = limits.erase(it);
|
||||||
|
limitsChanged = true;
|
||||||
|
} else {
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (limitsChanged) {
|
||||||
|
SettingsCache::instance().downloads().setHostRequestLimits(limits);
|
||||||
|
}
|
||||||
|
|
||||||
|
refreshUrlItems();
|
||||||
|
}
|
||||||
|
|
||||||
|
QListWidgetItem *DeckEditorSettingsPage::addUrlItem(const QString &url)
|
||||||
|
{
|
||||||
|
auto *item = new QListWidgetItem(urlLabel(url));
|
||||||
|
item->setData(Qt::UserRole, url);
|
||||||
|
urlList->addItem(item);
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString DeckEditorSettingsPage::urlForItem(const QListWidgetItem *item) const
|
||||||
|
{
|
||||||
|
return item->data(Qt::UserRole).toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
QString DeckEditorSettingsPage::urlLabel(const QString &url) const
|
||||||
|
{
|
||||||
|
const QString host = QUrl(url).host();
|
||||||
|
if (host.isEmpty()) {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QHash<QString, int> limits = SettingsCache::instance().downloads().getHostRequestLimits();
|
||||||
|
const int devCap =
|
||||||
|
DownloadSettings::getDeveloperHostCaps().value(host, DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT);
|
||||||
|
if (devCap == DownloadSettings::UNLIMITED_HOST_QUOTA && !limits.contains(host)) {
|
||||||
|
return tr("%1 (unlimited)").arg(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
const int requested = limits.value(
|
||||||
|
host, devCap == DownloadSettings::UNLIMITED_HOST_QUOTA ? DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT : devCap);
|
||||||
|
const int effective = SettingsCache::instance().downloads().clampHostRequestLimit(host, requested);
|
||||||
|
return tr("%1 (%2/s)").arg(url).arg(effective);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DeckEditorSettingsPage::refreshUrlItems()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < urlList->count(); ++i) {
|
||||||
|
QListWidgetItem *item = urlList->item(i);
|
||||||
|
item->setText(urlLabel(urlForItem(item)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void DeckEditorSettingsPage::actAdjustRateLimit()
|
||||||
|
{
|
||||||
|
if (urlList->currentItem() == nullptr) {
|
||||||
|
QMessageBox::information(this, tr("Adjust Rate Limit"), tr("Select a URL in the list first."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString host = QUrl(urlForItem(urlList->currentItem())).host();
|
||||||
|
if (host.isEmpty()) {
|
||||||
|
QMessageBox::information(this, tr("Adjust Rate Limit"), tr("The selected URL does not have a valid host."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QHash<QString, int> &devCaps = DownloadSettings::getDeveloperHostCaps();
|
||||||
|
const QHash<QString, int> currentLimits = SettingsCache::instance().downloads().getHostRequestLimits();
|
||||||
|
const int devCap = devCaps.value(host, DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT);
|
||||||
|
const bool unlocked = devCap == DownloadSettings::UNLIMITED_HOST_QUOTA;
|
||||||
|
|
||||||
|
bool ok = false;
|
||||||
|
int minimum;
|
||||||
|
int maximum;
|
||||||
|
int defaultValue;
|
||||||
|
QString prompt;
|
||||||
|
if (unlocked) {
|
||||||
|
minimum = 0; // 0 means "unlimited"
|
||||||
|
maximum = DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT;
|
||||||
|
defaultValue = currentLimits.value(host, 0);
|
||||||
|
prompt = tr("Requests per second (0 = unlimited, fastest; up to %1):").arg(maximum);
|
||||||
|
} else {
|
||||||
|
minimum = DownloadSettings::MIN_HOST_REQUEST_LIMIT;
|
||||||
|
maximum = devCap;
|
||||||
|
defaultValue = currentLimits.value(host, devCap);
|
||||||
|
prompt = tr("Requests per second (developer maximum is %1):").arg(maximum);
|
||||||
|
}
|
||||||
|
|
||||||
|
const int value = QInputDialog::getInt(this, tr("Adjust Rate Limit for %1").arg(host), prompt, defaultValue,
|
||||||
|
minimum, maximum, 1, &ok);
|
||||||
|
if (!ok) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QHash<QString, int> limits = currentLimits;
|
||||||
|
if (unlocked ? value == 0 : value == devCap) {
|
||||||
|
limits.remove(host);
|
||||||
|
} else {
|
||||||
|
limits.insert(host, value);
|
||||||
|
}
|
||||||
|
SettingsCache::instance().downloads().setHostRequestLimits(limits);
|
||||||
|
refreshUrlItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int)
|
void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int)
|
||||||
|
|
@ -244,4 +375,8 @@ void DeckEditorSettingsPage::retranslateUi()
|
||||||
aAdd->setText(tr("Add New URL"));
|
aAdd->setText(tr("Add New URL"));
|
||||||
aEdit->setText(tr("Edit URL"));
|
aEdit->setText(tr("Edit URL"));
|
||||||
aRemove->setText(tr("Remove URL"));
|
aRemove->setText(tr("Remove URL"));
|
||||||
}
|
aRateLimit->setText(tr("Adjust Rate Limit"));
|
||||||
|
|
||||||
|
// The per-URL rate limit suffixes are translated, so refresh them when the language changes.
|
||||||
|
refreshUrlItems();
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ private slots:
|
||||||
void actAddURL();
|
void actAddURL();
|
||||||
void actRemoveURL();
|
void actRemoveURL();
|
||||||
void actEditURL();
|
void actEditURL();
|
||||||
|
void actAdjustRateLimit();
|
||||||
void resetDownloadedURLsButtonClicked();
|
void resetDownloadedURLsButtonClicked();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
@ -34,7 +35,7 @@ private:
|
||||||
QLabel urlLinkLabel;
|
QLabel urlLinkLabel;
|
||||||
QCheckBox picDownloadCheckBox;
|
QCheckBox picDownloadCheckBox;
|
||||||
QListWidget *urlList;
|
QListWidget *urlList;
|
||||||
QAction *aAdd, *aEdit, *aRemove;
|
QAction *aAdd, *aEdit, *aRemove, *aRateLimit;
|
||||||
QCheckBox mcDownloadSpoilersCheckBox;
|
QCheckBox mcDownloadSpoilersCheckBox;
|
||||||
QLabel msDownloadSpoilersLabel;
|
QLabel msDownloadSpoilersLabel;
|
||||||
QGroupBox *mpGeneralGroupBox;
|
QGroupBox *mpGeneralGroupBox;
|
||||||
|
|
@ -46,6 +47,18 @@ private:
|
||||||
QLabel infoOnSpoilersLabel;
|
QLabel infoOnSpoilersLabel;
|
||||||
QPushButton *mpSpoilerPathButton;
|
QPushButton *mpSpoilerPathButton;
|
||||||
QPushButton *updateNowButton;
|
QPushButton *updateNowButton;
|
||||||
|
|
||||||
|
/** @brief Adds a list item for the given URL, storing the raw URL alongside its displayed label. */
|
||||||
|
QListWidgetItem *addUrlItem(const QString &url);
|
||||||
|
|
||||||
|
/** @brief Returns the raw URL stored on a list item. */
|
||||||
|
[[nodiscard]] QString urlForItem(const QListWidgetItem *item) const;
|
||||||
|
|
||||||
|
/** @brief Returns the display label for a URL, including its current effective rate limit. */
|
||||||
|
[[nodiscard]] QString urlLabel(const QString &url) const;
|
||||||
|
|
||||||
|
/** @brief Refreshes the displayed label of every URL item after limits or settings change. */
|
||||||
|
void refreshUrlItems();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
|
#endif // COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,22 @@ const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = {
|
||||||
"https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card",
|
"https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card",
|
||||||
"https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"};
|
"https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"};
|
||||||
|
|
||||||
|
// Developer-set ceilings for the per-host request allowance. Users may lower a host's
|
||||||
|
// allowance via the download settings, but can never raise it above these values. Hosts
|
||||||
|
// not listed default to DEFAULT_HOST_REQUEST_LIMIT. A cap of UNLIMITED_HOST_QUOTA marks a
|
||||||
|
// host that is never throttled per host and skips the dispatch pacing (429 backoff still applies).
|
||||||
|
const QHash<QString, int> DownloadSettings::DEVELOPER_HOST_CAPS = {
|
||||||
|
// The Scryfall API enforces 10 requests/second; stay one under so a burst can't trip 429s.
|
||||||
|
{"api.scryfall.com", 9},
|
||||||
|
// The Scryfall image CDN has no documented per-client rate limit.
|
||||||
|
{"cards.scryfall.io", UNLIMITED_HOST_QUOTA},
|
||||||
|
};
|
||||||
|
|
||||||
|
const QHash<QString, int> &DownloadSettings::getDeveloperHostCaps()
|
||||||
|
{
|
||||||
|
return DEVELOPER_HOST_CAPS;
|
||||||
|
}
|
||||||
|
|
||||||
DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr)
|
DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr)
|
||||||
: SettingsManager(settingPath + "downloads.ini", "downloads", QString(), parent)
|
: SettingsManager(settingPath + "downloads.ini", "downloads", QString(), parent)
|
||||||
{
|
{
|
||||||
|
|
@ -50,3 +66,57 @@ void DownloadSettings::setDownloadSpoilerStatus(bool _spoilerStatus)
|
||||||
setValue(_spoilerStatus, "downloadSpoilers");
|
setValue(_spoilerStatus, "downloadSpoilers");
|
||||||
emit downloadSpoilerStatusChanged();
|
emit downloadSpoilerStatusChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QHash<QString, int> DownloadSettings::getHostRequestLimits() const
|
||||||
|
{
|
||||||
|
auto settings = getSettings();
|
||||||
|
if (!defaultGroup.isEmpty()) {
|
||||||
|
settings.beginGroup(defaultGroup);
|
||||||
|
}
|
||||||
|
settings.beginGroup("hostRequestLimits");
|
||||||
|
|
||||||
|
QHash<QString, int> hostRequestLimits;
|
||||||
|
const QStringList hosts = settings.childKeys();
|
||||||
|
for (const QString &host : hosts) {
|
||||||
|
hostRequestLimits.insert(host, settings.value(host).toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
settings.endGroup();
|
||||||
|
if (!defaultGroup.isEmpty()) {
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
return hostRequestLimits;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DownloadSettings::setHostRequestLimits(const QHash<QString, int> &hostRequestLimits)
|
||||||
|
{
|
||||||
|
auto settings = getSettings();
|
||||||
|
if (!defaultGroup.isEmpty()) {
|
||||||
|
settings.beginGroup(defaultGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drop the legacy single-key form (an opaque @Variant blob) written by earlier builds so each
|
||||||
|
// host is stored as a plain, hand-editable key in its own subgroup.
|
||||||
|
settings.remove("hostRequestLimits");
|
||||||
|
settings.beginGroup("hostRequestLimits");
|
||||||
|
settings.remove(QString());
|
||||||
|
for (auto it = hostRequestLimits.cbegin(); it != hostRequestLimits.cend(); ++it) {
|
||||||
|
settings.setValue(it.key(), it.value());
|
||||||
|
}
|
||||||
|
settings.endGroup();
|
||||||
|
|
||||||
|
if (!defaultGroup.isEmpty()) {
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
settings.sync();
|
||||||
|
emit hostRequestLimitsChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
int DownloadSettings::clampHostRequestLimit(const QString &host, int requested) const
|
||||||
|
{
|
||||||
|
const int devCap = DEVELOPER_HOST_CAPS.value(host, DEFAULT_HOST_REQUEST_LIMIT);
|
||||||
|
if (devCap == UNLIMITED_HOST_QUOTA) {
|
||||||
|
return qMax(MIN_HOST_REQUEST_LIMIT, requested);
|
||||||
|
}
|
||||||
|
return qBound(MIN_HOST_REQUEST_LIMIT, requested, devCap);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,34 @@
|
||||||
|
|
||||||
#include "settings_manager.h"
|
#include "settings_manager.h"
|
||||||
|
|
||||||
|
#include <QHash>
|
||||||
|
|
||||||
class DownloadSettings : public SettingsManager
|
class DownloadSettings : public SettingsManager
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
friend class SettingsCache;
|
friend class SettingsCache;
|
||||||
|
|
||||||
static const QStringList DEFAULT_DOWNLOAD_URLS;
|
static const QStringList DEFAULT_DOWNLOAD_URLS;
|
||||||
|
static const QHash<QString, int> DEVELOPER_HOST_CAPS;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
/** @brief Per-host request allowance (requests/second) when no developer cap applies. */
|
||||||
|
static constexpr int DEFAULT_HOST_REQUEST_LIMIT = 10;
|
||||||
|
/** @brief Floor for any per-host request allowance. */
|
||||||
|
static constexpr int MIN_HOST_REQUEST_LIMIT = 1;
|
||||||
|
/** @brief Developer cap marking a host as never throttled per host or by the dispatch pacing. */
|
||||||
|
static constexpr int UNLIMITED_HOST_QUOTA = -1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Developer-set per-host allowance ceilings (requests/second), keyed by host.
|
||||||
|
*
|
||||||
|
* Hosts not present default to DEFAULT_HOST_REQUEST_LIMIT. An entry of
|
||||||
|
* UNLIMITED_HOST_QUOTA marks a host that users may still lower, but that is never
|
||||||
|
* throttled per host by default. Users can never raise a host's allowance above its
|
||||||
|
* developer cap.
|
||||||
|
*/
|
||||||
|
static const QHash<QString, int> &getDeveloperHostCaps();
|
||||||
|
|
||||||
explicit DownloadSettings(const QString &, QObject *);
|
explicit DownloadSettings(const QString &, QObject *);
|
||||||
|
|
||||||
QStringList getAllURLs() const;
|
QStringList getAllURLs() const;
|
||||||
|
|
@ -27,9 +47,23 @@ public:
|
||||||
[[nodiscard]] bool getDownloadSpoilersStatus() const;
|
[[nodiscard]] bool getDownloadSpoilersStatus() const;
|
||||||
void setDownloadSpoilerStatus(bool _spoilerStatus);
|
void setDownloadSpoilerStatus(bool _spoilerStatus);
|
||||||
|
|
||||||
|
/** @brief User-set per-host request allowances (requests/second). Missing hosts use the developer default. */
|
||||||
|
QHash<QString, int> getHostRequestLimits() const;
|
||||||
|
void setHostRequestLimits(const QHash<QString, int> &hostRequestLimits);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Clamps the user's requested allowance for a host against its developer cap.
|
||||||
|
* @param host The host to clamp for
|
||||||
|
* @param requested The user-requested allowance in requests/second
|
||||||
|
* @return The effective allowance. Users may lower a host's allowance but never raise it
|
||||||
|
* above the developer cap; hosts with UNLIMITED_HOST_QUOTA have no upper bound.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] int clampHostRequestLimit(const QString &host, int requested) const;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void picDownloadChanged();
|
void picDownloadChanged();
|
||||||
void downloadSpoilerStatusChanged();
|
void downloadSpoilerStatusChanged();
|
||||||
|
void hostRequestLimitsChanged();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COCKATRICE_DOWNLOADSETTINGS_H
|
#endif // COCKATRICE_DOWNLOADSETTINGS_H
|
||||||
|
|
|
||||||
|
|
@ -334,6 +334,38 @@ TEST_F(SettingsDefaultsTest, Download_DownloadSpoilersStatus_Default)
|
||||||
ASSERT_EQ(s.getDownloadSpoilersStatus(), false);
|
ASSERT_EQ(s.getDownloadSpoilersStatus(), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_F(SettingsDefaultsTest, Download_HostRequestLimits_Default)
|
||||||
|
{
|
||||||
|
DownloadSettings s(settingsPath, nullptr);
|
||||||
|
ASSERT_TRUE(s.getHostRequestLimits().isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(SettingsDefaultsTest, Download_HostRequestLimits_SetAndGet)
|
||||||
|
{
|
||||||
|
DownloadSettings s(settingsPath, nullptr);
|
||||||
|
s.setHostRequestLimits({{"api.scryfall.com", 5}});
|
||||||
|
const QHash<QString, int> limits = s.getHostRequestLimits();
|
||||||
|
ASSERT_EQ(limits.size(), 1);
|
||||||
|
ASSERT_EQ(limits.value("api.scryfall.com"), 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(SettingsDefaultsTest, Download_HostRequestLimits_StackedHostCaps)
|
||||||
|
{
|
||||||
|
DownloadSettings s(settingsPath, nullptr);
|
||||||
|
// The developer cap for the Scryfall API lowers the ceiling to 9; a user can
|
||||||
|
// reduce it further but can never raise it above the cap.
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 9), 9);
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 20), 9);
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 5), 5);
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 0), 1);
|
||||||
|
// Hosts without a developer cap fall back to the global default ceiling.
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("gatherer.wizards.com", 10), 10);
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("gatherer.wizards.com", 20), 10);
|
||||||
|
// The Scryfall CDN is unlocked: no upper bound (values are only floored).
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("cards.scryfall.io", 20), 20);
|
||||||
|
ASSERT_EQ(s.clampHostRequestLimit("cards.scryfall.io", 0), 1);
|
||||||
|
}
|
||||||
|
|
||||||
// --- AppearanceSettings ---
|
// --- AppearanceSettings ---
|
||||||
|
|
||||||
TEST_F(SettingsDefaultsTest, Appearance_ThemeName_Default)
|
TEST_F(SettingsDefaultsTest, Appearance_ThemeName_Default)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue