From 9032310b3ea53c9ef7b69ffd741d4d95ddc9dbb0 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Wed, 12 Feb 2025 20:46:33 -0800 Subject: [PATCH] refactor version lookup --- .../src/client/network/release_channel.cpp | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/cockatrice/src/client/network/release_channel.cpp b/cockatrice/src/client/network/release_channel.cpp index 86e199651..bd492f8c9 100644 --- a/cockatrice/src/client/network/release_channel.cpp +++ b/cockatrice/src/client/network/release_channel.cpp @@ -121,23 +121,15 @@ void StableReleaseChannel::releaseListFinished() if (resultMap.contains("assets")) { auto rawAssets = resultMap["assets"].toList(); - // [(name, url)] - QVector> assets; - std::transform(rawAssets.begin(), rawAssets.end(), std::back_inserter(assets), [](QVariant _asset) { - QVariantMap asset = _asset.toMap(); + for (const auto &rawAsset : rawAssets) { + QVariantMap asset = rawAsset.toMap(); QString name = asset["name"].toString(); QString url = asset["browser_download_url"].toString(); - return std::make_pair(name, url); - }); - auto _releaseAsset = std::find_if(assets.begin(), assets.end(), [](std::pair nameAndUrl) { - return downloadMatchesCurrentOS(nameAndUrl.first); - }); - - if (_releaseAsset != assets.end()) { - std::pair releaseAsset = *_releaseAsset; - auto releaseUrl = releaseAsset.second; - lastRelease->setDownloadUrl(releaseUrl); + if (downloadMatchesCurrentOS(name)) { + lastRelease->setDownloadUrl(url); + break; + } } }