From df67878f7b837e91c759131c61974d11acb597bd Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Mon, 5 Aug 2024 14:30:27 -0500 Subject: [PATCH] Fix max version column for wildcard compat --- Core/Repositories/AvailableModule.cs | 32 ++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Core/Repositories/AvailableModule.cs b/Core/Repositories/AvailableModule.cs index 15d53aa59..ce07a0260 100644 --- a/Core/Repositories/AvailableModule.cs +++ b/Core/Repositories/AvailableModule.cs @@ -11,6 +11,7 @@ using Newtonsoft.Json.Serialization; using CKAN.Versioning; +using CKAN.Extensions; namespace CKAN { @@ -195,26 +196,21 @@ private static bool DependsAndConflictsOK(CkanModule module, ICollection public GameVersion LatestCompatibleGameVersion(List realVersions) { - // Cheat slightly for performance: - // Find the CkanModule with the highest ksp_version_max, - // then get the real latest compatible of just that one mod - GameVersion best = null; - CkanModule bestMod = null; - foreach (var mod in module_version.Values) + var ranges = module_version.Values + .Select(m => new GameVersionRange(m.EarliestCompatibleGameVersion(), + m.LatestCompatibleGameVersion())) + .Memoize(); + if (ranges.Any(r => r.Upper.Value.IsAny)) { - var v = mod.LatestCompatibleGameVersion(); - if (v.IsAny) - { - // Can't get later than Any, so stop - return mod.LatestCompatibleRealGameVersion(realVersions); - } - else if (best == null || best < v) - { - best = v; - bestMod = mod; - } + // Can't get later than Any, so no need for more complex logic + return realVersions.Last(); } - return bestMod.LatestCompatibleRealGameVersion(realVersions); + // Find the range with the highest upper bound + var bestRange = ranges.Distinct() + .Aggregate((best, r) => r.Upper == GameVersionBound.Highest(best.Upper, r.Upper) + ? r + : best); + return realVersions.LastOrDefault(v => bestRange.Contains(v)); } ///