From c28acf8ba6086f185564d43cba1cfdcf71bdbca2 Mon Sep 17 00:00:00 2001 From: Bryce! Date: Mon, 2 Nov 2026 00:34:34 -0500 Subject: [PATCH] Format picture-loader changes using project style --- .../card_picture_loader_image_formats.h | 2 +- .../card_picture_loader_worker.cpp | 47 +++++++++---------- .../card_picture_loader_worker_work.cpp | 3 +- .../card_picture_loader_worker_work.h | 4 +- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_image_formats.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_image_formats.h index 2d6cc27f9..139cdabbf 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_image_formats.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_image_formats.h @@ -4,9 +4,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp index 238637d53..96e859906 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -6,9 +6,9 @@ #include "card_picture_loader_local.h" #include "card_picture_loader_worker_work.h" #include "card_picture_to_load.h" -#include "redirect_chain.h" #include "libcockatrice/card/printing/exact_card.h" #include "libcockatrice/utility/server_rate_limiter.h" +#include "redirect_chain.h" #include #include @@ -102,23 +102,22 @@ CardPictureLoaderWorker::CardPictureLoaderWorker() connect(&SettingsCache::instance().downloads(), &DownloadSettings::hostRequestLimitsChanged, this, [this] { hostRequestLimits = SettingsCache::instance().downloads().getHostRequestLimits(); }); - connect(&SettingsCache::instance().downloads(), &DownloadSettings::picDownloadChanged, this, - [this] { - picDownload = SettingsCache::instance().downloads().getPicDownload(); - if (!picDownload) { - // Waiting for network quota or 429 recovery cannot help a cache-only lookup. - // Retire cancelled status entries just as the normal dispatcher does. - while (!requestLoadQueue.isEmpty()) { - const auto entry = requestLoadQueue.takeFirst(); - if (entry.second) { - makeRequest(entry.first, entry.second); - } else { - emit imageRequestSucceeded(entry.first); - } - } - updateTimerState(); + connect(&SettingsCache::instance().downloads(), &DownloadSettings::picDownloadChanged, this, [this] { + picDownload = SettingsCache::instance().downloads().getPicDownload(); + if (!picDownload) { + // Waiting for network quota or 429 recovery cannot help a cache-only lookup. + // Retire cancelled status entries just as the normal dispatcher does. + while (!requestLoadQueue.isEmpty()) { + const auto entry = requestLoadQueue.takeFirst(); + if (entry.second) { + makeRequest(entry.first, entry.second); + } else { + emit imageRequestSucceeded(entry.first); } - }); + } + updateTimerState(); + } + }); } CardPictureLoaderWorker::~CardPictureLoaderWorker() @@ -157,9 +156,9 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor { const QUrl resolvedUrl = resolveCachedRedirect(url); if (!picDownload || (static_cast( - SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) == - CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE && - cache->metaData(resolvedUrl).isValid() && !worker->shouldBypassCache(resolvedUrl))) { + SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) == + CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE && + cache->metaData(resolvedUrl).isValid() && !worker->shouldBypassCache(resolvedUrl))) { // A request that will be served from the disk cache never touches the network and therefore // doesn't use up any of the rate limit, so it gets to skip the queue. // Every reply retires a status, including online cache hits and deferred @@ -180,9 +179,8 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture const QUrl resolvedUrl = resolveCachedRedirect(url); if (resolvedUrl != url) { emit imageRequestSucceeded(url); - if (requestTouchesNetwork(resolvedUrl, worker) && - CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(resolvedUrl.host(), - QDateTime::currentDateTime())) { + if (requestTouchesNetwork(resolvedUrl, worker) && CardPictureLoaderWorkerWork::rateLimiter().isRateLimited( + resolvedUrl.host(), QDateTime::currentDateTime())) { worker->scheduleDeferredRetry(resolvedUrl.host()); return nullptr; } @@ -443,8 +441,7 @@ bool CardPictureLoaderWorker::processSingleRequest() return false; } -bool CardPictureLoaderWorker::requestTouchesNetwork(const QUrl &url, - const CardPictureLoaderWorkerWork *worker) const +bool CardPictureLoaderWorker::requestTouchesNetwork(const QUrl &url, const CardPictureLoaderWorkerWork *worker) const { if (!picDownload) { return false; diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp index ede5393a6..696d7c25a 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp @@ -263,8 +263,7 @@ void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); if (statusCode == 301 || statusCode == 302 || statusCode == 303 || statusCode == 305 || statusCode == 307 || statusCode == 308) { - QUrl redirectUrl = reply->url().resolved( - reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl()); + QUrl redirectUrl = reply->url().resolved(reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl()); qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: following " << (isFromCache ? "cached redirect" : "redirect") << " to " diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h index 716bd4bba..da9420773 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h @@ -6,8 +6,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -80,7 +80,7 @@ public slots: void handleNetworkReply(QNetworkReply *reply); private: - bool picDownload; ///< Whether network downloading is enabled + bool picDownload; ///< Whether network downloading is enabled QTimer *deferredRetry = nullptr; ///< Owned retry, cancellable when downloads are disabled QSet retriedCacheUrls;