[PictureLoader] Let unlocked hosts skip dispatch pacing; adjust limits per URL

Two refinements to the per-host request caps:

- Unlocked hosts (UNLIMITED_HOST_QUOTA, e.g. cards.scryfall.io) no longer
  wait on the 100ms dispatch pacing or consume the global per-second quota.
  dispatchQueuedRequest fires their queued requests back-to-back, bounded
  only by their 429 backoff window and Qt's per-host connection pool, so
  an unthrottled CDN is not artificially slowed.
- The deck editor download settings page replaces the static grid of one
  spinbox per known host with an "Adjust Rate Limit" toolbar action on the
  URL list. It picks the host out of the selected URL and clamps the entry
  against the developer cap table (including for user-added URLs).

Also fixes a review finding: resetRequestQuota could write the
UNLIMITED_HOST_QUOTA sentinel (-1) into the sustained per-host quota when a
host became unlocked mid-run, permanently poisoning its allowance. Stale
entries for unlocked hosts are now dropped, and the per-second seed is
clamped against the effective ceiling so a lowered limit applies immediately.

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp

@@ -24,6 +24,7 @@ static constexpr qint64 QUOTA_RESET_INTERVAL_MS = 1000; ///< Interval at which t
 
 CardPictureLoaderWorker::CardPictureLoaderWorker()
     : QObject(nullptr), picDownload(SettingsCache::instance().downloads().getPicDownload()),
+      requestQuota(MAX_REQUESTS_PER_SEC),
       hostRequestLimits(SettingsCache::instance().downloads().getHostRequestLimits())
 {
     networkManager = new QNetworkAccessManager(this);
@@ -112,14 +113,6 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     QUrl cachedRedirect = getCachedRedirect(url);
     if (!cachedRedirect.isEmpty()) {
         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);
     }
 
@@ -140,43 +133,31 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
 
     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, &QNetworkReply::finished, worker, [this, reply, worker, host] {
+    connect(reply, &QNetworkReply::finished, worker, [reply, worker] { worker->handleNetworkReply(reply); });
-        hostInFlight.insert(host, qMax(0, hostInFlight.value(host) - 1));
-        worker->handleNetworkReply(reply);
-    });
 
     return reply;
 }
 
 void CardPictureLoaderWorker::resetRequestQuota()
 {
-    // Allowances are seeded lazily per host in processSingleRequest() when a request is first
+    requestQuota = MAX_REQUESTS_PER_SEC;
-    // looked at in a new second, so a host that enters the queue mid-second now gets its reduced
+    // Allowances are seeded per host on demand in processSingleRequest(), so a
-    // per-host allowance instead of falling through to the full per-second default.
+    // rate-limited host never gets a fresh full quota mid-second.
     hostQuotaRemaining.clear();
 
     QDateTime now = QDateTime::currentDateTime();
     for (auto it = hostRequestQuota.begin(); it != hostRequestQuota.end();) {
+        // An unlocked host has no per-host allowance; drop any stale entry instead of
+        // recovering it towards the UNLIMITED_HOST_QUOTA sentinel, which would poison it.
+        if (hostAllowanceCeiling(it.key()) == DownloadSettings::UNLIMITED_HOST_QUOTA) {
+            it = hostRequestQuota.erase(it);
+            continue;
+        }
         if (!hostLast429.contains(it.key()) || now.msecsTo(hostLast429.value(it.key())) < -QUOTA_RECOVER_MS) {
-            if (hostAllowanceCeiling(it.key()) == DownloadSettings::UNLIMITED_HOST_QUOTA) {
+            // Recover towards the host's effective allowance ceiling, which may be
-                // A developer-unlocked host that fell back after a 429 recovers towards the default
+            // lowered by the user's per-host request limits.
-                // allowance; once it gets there it becomes unlocked (fast-path) again.
+            it.value() = qMin(hostAllowanceCeiling(it.key()), it.value() + 1);
-                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;
     }
@@ -186,76 +167,49 @@ void CardPictureLoaderWorker::resetRequestQuota()
 
 void CardPictureLoaderWorker::processQueuedRequests()
 {
-    Q_ASSERT(thread() == QThread::currentThread());
-
     if (requestLoadQueue.isEmpty()) {
         dispatchTimer.stop();
-        requestTimer.stop();
         return;
     }
     // Start lazily from the worker's own thread: QTimer must be started in the thread it lives in.
     if (!requestTimer.isActive()) {
         requestTimer.start();
     }
-    // Restarting an active timer would reset the pacing countdown, so a burst of enqueues could
+    dispatchTimer.start();
-    // keep starving the dispatcher; only start it when it has actually stopped.
-    if (!dispatchTimer.isActive()) {
-        dispatchTimer.start();
-    }
 }
 
 void CardPictureLoaderWorker::dispatchQueuedRequest()
 {
     if (requestLoadQueue.isEmpty()) {
-        // All queued requests have been dispatched; stop the pacing and quota-reset timers.
         dispatchTimer.stop();
-        requestTimer.stop();
         return;
     }
 
+    // Unlocked hosts (developer cap UNLIMITED_HOST_QUOTA) skip the dispatch pacing and the
+    // global per-second quota: dispatch every queued request for them back-to-back, bounded
+    // only by their 429 backoff window and Qt's per-host connection pool.
     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 (hostAllowanceCeiling(host) == DownloadSettings::UNLIMITED_HOST_QUOTA &&
-            if (CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(host, now)) {
+            !CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(host, now)) {
-                ++i;
+            makeRequest(request.first, request.second);
-                continue;
+            requestLoadQueue.removeAt(i);
-            }
+        } else {
-            if (hostInFlight.value(host) < MAX_IN_FLIGHT_PER_HOST) {
+            ++i;
-                makeRequest(request.first, request.second);
-                requestLoadQueue.removeAt(i);
-                dispatched = true;
-                continue;
-            }
-            unlockedCapped = true;
         }
-        ++i;
     }
 
-    if (requestLoadQueue.isEmpty()) {
+    if (requestLoadQueue.isEmpty() || requestQuota <= 0) {
         dispatchTimer.stop();
-        requestTimer.stop();
         return;
     }
 
     if (processSingleRequest()) {
-        dispatched = true;
+        --requestQuota;
-    }
+    } 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();
     }
 }
@@ -266,28 +220,14 @@ bool CardPictureLoaderWorker::processSingleRequest()
     for (int i = 0; i < requestLoadQueue.size(); ++i) {
         const auto &request = requestLoadQueue.at(i);
         const QString host = request.first.host();
-        // Don't dispatch requests to a host that is currently in its 429 backoff; hand the entry
+        // Don't dispatch requests to a host that is currently in its 429 backoff.
-        // 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);
+        const int ceiling = hostAllowanceCeiling(host);
-        if (ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA) {
+        // Seed the allowance only now, so a host that was rate limited last second
-            // A 429 dropped this unlocked host out of the fast path and installed a concrete
+        // doesn't get a fresh full quota the moment it is queried mid-second. Clamp
-            // allowance; pace it against that allowance until the recovery loop unlocks it again.
+        // against the ceiling so a lowered user cap applies from this second onward.
-            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)));
         }
@@ -312,20 +252,15 @@ int CardPictureLoaderWorker::hostAllowanceCeiling(const QString &host) const
     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)
 {
     const int ceiling = hostAllowanceCeiling(host);
-    // An unlocked host has no per-host allowance to halve. Install one instead so it drops out of
+    if (ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA) {
-    // the unlocked fast path and is paced like a throttled host; the recovery loop in
+        // Unlocked hosts have no per-host allowance to halve; the shared backoff
-    // resetRequestQuota() then walks it back up and unlocks it again.
+        // window tracked by the rate limiter still paces them.
-    const int base =
+        return;
-        ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA ? DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT : ceiling;
+    }
-    hostRequestQuota.insert(host, qMax(MIN_HOST_QUOTA, hostRequestQuota.value(host, base) / 2));
+    hostRequestQuota.insert(host, qMax(MIN_HOST_QUOTA, hostRequestQuota.value(host, ceiling) / 2));
     hostLast429.insert(host, QDateTime::currentDateTime());
 }
 

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h

@@ -86,7 +86,7 @@ public slots:
      */
     QNetworkReply *makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *workThread);
 
-    /** @brief Starts the pacing timers if there is queued work, stops them when the queue is empty. */
+    /** @brief Processes all queued requests respecting the request quota. */
     void processQueuedRequests();
 
     /** @brief Chooses a request from the queue and starts it, respecting the quota and pacing. */
@@ -121,16 +121,13 @@ private:
     bool picDownload;                                  ///< Whether downloading images from network is enabled
     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 dispatchTimer;                   ///< Timer pacing individual network requests
     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, 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
     QSet<QString> currentlyLoading;      ///< Deduplication: contains pixmapCacheKey currently being loaded
@@ -143,14 +140,6 @@ private:
      */
     [[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. */
     [[nodiscard]] QUrl getCachedRedirect(const QUrl &originalUrl) const;
 

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp

@@ -22,7 +22,7 @@ static const QStringList MD5_BLACKLIST = {
     "fbc7d763c08771c260b39e2115414eeb"  // Current card back hash
 };
 
-const ServerRateLimiter &CardPictureLoaderWorkerWork::rateLimiter()
+ServerRateLimiter &CardPictureLoaderWorkerWork::rateLimiter()
 {
     return s_rateLimiter;
 }

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h

@@ -44,27 +44,7 @@ public:
     CardPictureToLoad cardToDownload; ///< The card and associated URLs to try downloading
 
     /** @brief Shared per-server 429 backoff state. */
-    static const ServerRateLimiter &rateLimiter();
+    static 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:
     /**
@@ -78,6 +58,9 @@ private:
 
     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. */
     void picDownloadFailed();
 
@@ -102,6 +85,16 @@ private:
      */
     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:
     /** @brief Updates the picDownload setting when it changes. */
     void picDownloadChanged();

cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp

@@ -10,7 +10,6 @@
 #include <QInputDialog>
 #include <QLineEdit>
 #include <QMessageBox>
-#include <QSet>
 #include <QToolBar>
 #include <QUrl>
 #include <libcockatrice/settings/download_settings.h>
@@ -18,6 +17,8 @@
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/macros.h>
 
+static constexpr int UNLOCKED_HOST_LIMIT_MAX = 50; ///< Upper bound for rate limits on hosts unlocked by the developer
+
 DeckEditorSettingsPage::DeckEditorSettingsPage()
 {
     picDownloadCheckBox.setChecked(SettingsCache::instance().downloads().getPicDownload());
@@ -53,9 +54,7 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
     urlList->setDragDropMode(QAbstractItemView::InternalMove);
     connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged);
 
-    for (const QString &url : SettingsCache::instance().downloads().getAllURLs()) {
+    urlList->addItems(SettingsCache::instance().downloads().getAllURLs());
-        addUrlItem(url);
-    }
 
     aAdd = new QAction(this);
     aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
@@ -126,9 +125,7 @@ void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()
 {
     SettingsCache::instance().downloads().resetToDefaultURLs();
     urlList->clear();
-    for (const QString &url : SettingsCache::instance().downloads().getAllURLs()) {
+    urlList->addItems(SettingsCache::instance().downloads().getAllURLs());
-        addUrlItem(url);
-    }
     QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset."));
 }
 
@@ -137,7 +134,7 @@ void DeckEditorSettingsPage::actAddURL()
     bool ok;
     QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok);
     if (ok) {
-        addUrlItem(msg);
+        urlList->addItem(msg);
         storeSettings();
     }
 }
@@ -152,14 +149,12 @@ void DeckEditorSettingsPage::actRemoveURL()
 
 void DeckEditorSettingsPage::actEditURL()
 {
-    QListWidgetItem *item = urlList->currentItem();
+    if (urlList->currentItem()) {
-    if (item) {
+        QString oldText = urlList->currentItem()->text();
-        const QString oldText = urlForItem(item);
         bool ok;
         QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok);
         if (ok) {
-            item->setData(Qt::UserRole, msg);
+            urlList->currentItem()->setText(msg);
-            item->setText(urlLabel(msg));
             storeSettings();
         }
     }
@@ -171,77 +166,10 @@ void DeckEditorSettingsPage::storeSettings()
 
     QStringList downloadUrls;
     for (int i = 0; i < urlList->count(); i++) {
-        const QString url = urlForItem(urlList->item(i));
+        qInfo() << "Priority" << i << ":" << urlList->item(i)->text();
-        qInfo() << "Priority" << i << ":" << url;
+        downloadUrls << urlList->item(i)->text();
-        downloadUrls << url;
     }
     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()
@@ -251,7 +179,7 @@ void DeckEditorSettingsPage::actAdjustRateLimit()
         return;
     }
 
-    const QString host = QUrl(urlForItem(urlList->currentItem())).host();
+    const QString host = QUrl(urlList->currentItem()->text()).host();
     if (host.isEmpty()) {
         QMessageBox::information(this, tr("Adjust Rate Limit"), tr("The selected URL does not have a valid host."));
         return;
@@ -266,21 +194,19 @@ void DeckEditorSettingsPage::actAdjustRateLimit()
     int minimum;
     int maximum;
     int defaultValue;
-    QString prompt;
     if (unlocked) {
         minimum = 0; // 0 means "unlimited"
-        maximum = DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT;
+        maximum = UNLOCKED_HOST_LIMIT_MAX;
         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,
+    const int value = QInputDialog::getInt(this, tr("Adjust Rate Limit for %1").arg(host),
-                                           minimum, maximum, 1, &ok);
+                                           tr("Requests per second (developer maximum is %1):").arg(maximum),
+                                           defaultValue, minimum, maximum, 1, &ok);
     if (!ok) {
         return;
     }
@@ -292,7 +218,6 @@ void DeckEditorSettingsPage::actAdjustRateLimit()
         limits.insert(host, value);
     }
     SettingsCache::instance().downloads().setHostRequestLimits(limits);
-    refreshUrlItems();
 }
 
 void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int)
@@ -376,7 +301,4 @@ void DeckEditorSettingsPage::retranslateUi()
     aEdit->setText(tr("Edit 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();
 }

cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h

@@ -47,18 +47,6 @@ private:
     QLabel infoOnSpoilersLabel;
     QPushButton *mpSpoilerPathButton;
     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

libcockatrice_settings/libcockatrice/settings/download_settings.cpp

@@ -69,46 +69,21 @@ void DownloadSettings::setDownloadSpoilerStatus(bool _spoilerStatus)
 
 QHash<QString, int> DownloadSettings::getHostRequestLimits() const
 {
-    auto settings = getSettings();
+    const QVariantMap stored = getValue("hostRequestLimits").toMap();
-    if (!defaultGroup.isEmpty()) {
-        settings.beginGroup(defaultGroup);
-    }
-    settings.beginGroup("hostRequestLimits");
-
     QHash<QString, int> hostRequestLimits;
-    const QStringList hosts = settings.childKeys();
+    for (auto it = stored.cbegin(); it != stored.cend(); ++it) {
-    for (const QString &host : hosts) {
+        hostRequestLimits.insert(it.key(), it.value().toInt());
-        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();
+    QVariantMap stored;
-    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());
+        stored.insert(it.key(), it.value());
     }
-    settings.endGroup();
+    setValue(stored, "hostRequestLimits");
-
-    if (!defaultGroup.isEmpty()) {
-        settings.endGroup();
-    }
-    settings.sync();
     emit hostRequestLimitsChanged();
 }