From 2933e5dfc2b00e95158672acb7e45a08e4795a54 Mon Sep 17 00:00:00 2001 From: Matt Parker <61717342+MattParkerDev@users.noreply.github.com> Date: Sat, 1 Nov 2025 20:57:02 +1000 Subject: [PATCH] display highest version package in results --- .../Features/Nuget/NugetClientService.cs | 20 ++++++++++--------- .../Features/Nuget/PackageEntry.cs | 12 ++++++----- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs b/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs index c4dbcf8..66603a6 100644 --- a/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs +++ b/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs @@ -1,12 +1,15 @@ using NuGet.Common; using NuGet.Configuration; +using NuGet.Packaging.Core; using NuGet.Protocol; using NuGet.Protocol.Core.Types; using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence; namespace SharpIDE.Application.Features.Nuget; -public record IdePackageResult(IPackageSearchMetadata PackageSearchMetadata, List PackageSources); +//public record IdePackageResult(IPackageSearchMetadata PackageSearchMetadata, List PackageSources); +public record IdePackageResult(string PackageId, List PackageFromSources); +public record struct IdePackageFromSourceResult(IPackageSearchMetadata PackageSearchMetadata, PackageSource Source); public class NugetClientService { private readonly bool _includePrerelease = false; @@ -38,14 +41,14 @@ public class NugetClientService log: logger, cancellationToken: cancellationToken).ConfigureAwait(false); - packagesResult.AddRange(results.Select(s => new IdePackageResult(s, [source]))); + packagesResult.AddRange(results.Select(s => new IdePackageResult(s.Identity.Id, [new IdePackageFromSourceResult(s, source)]))); } // Combine, group, and order by download count var topPackages = packagesResult - .GroupBy(p => p.PackageSearchMetadata.Identity.Id, StringComparer.OrdinalIgnoreCase) + .GroupBy(p => p.PackageFromSources.First().PackageSearchMetadata.Identity.Id, StringComparer.OrdinalIgnoreCase) .Select(g => g.First()) - .OrderByDescending(p => p.PackageSearchMetadata.DownloadCount ?? 0) + .OrderByDescending(p => p.PackageFromSources.First().PackageSearchMetadata.DownloadCount ?? 0) .Take(100) .ToList(); @@ -63,7 +66,7 @@ public class NugetClientService // we need to find out if other package sources have the package too foreach (var package in topPackages) { - foreach (var source in packageSources.Except(package.PackageSources).ToList()) + foreach (var source in packageSources.Except(package.PackageFromSources.Select(s => s.Source)).ToList()) { var repository = Repository.Factory.GetCoreV3(source.Source); var searchResource = await repository.GetResourceAsync(cancellationToken).ConfigureAwait(false); @@ -71,19 +74,18 @@ public class NugetClientService if (searchResource == null) continue; - var packageId = package.PackageSearchMetadata.Identity.Id; // TODO: Might be faster to use FindPackageByIdResource var results = await searchResource.SearchAsync( - searchTerm: packageId, + searchTerm: package.PackageId, filters: new SearchFilter(includePrerelease: _includePrerelease), skip: 0, take: 2, log: logger, cancellationToken: cancellationToken).ConfigureAwait(false); - var foundPackage = results.SingleOrDefault(r => r.Identity.Id.Equals(packageId, StringComparison.OrdinalIgnoreCase)); + var foundPackage = results.SingleOrDefault(r => r.Identity.Id.Equals(package.PackageId, StringComparison.OrdinalIgnoreCase)); if (foundPackage != null) { - package.PackageSources.Add(source); + package.PackageFromSources.Add(new IdePackageFromSourceResult(foundPackage, source)); } } } diff --git a/src/SharpIDE.Godot/Features/Nuget/PackageEntry.cs b/src/SharpIDE.Godot/Features/Nuget/PackageEntry.cs index 12071dc..fd9c913 100644 --- a/src/SharpIDE.Godot/Features/Nuget/PackageEntry.cs +++ b/src/SharpIDE.Godot/Features/Nuget/PackageEntry.cs @@ -43,14 +43,16 @@ public partial class PackageEntry : MarginContainer private void ApplyValues() { if (PackageResult is null) return; - _packageNameLabel.Text = PackageResult.PackageSearchMetadata.Identity.Id; + _packageNameLabel.Text = PackageResult.PackageId; _currentVersionLabel.Text = string.Empty; - _latestVersionLabel.Text = PackageResult.PackageSearchMetadata.Identity.Version.ToNormalizedString(); + var highestVersionPackageFromSource = PackageResult.PackageFromSources + .MaxBy(p => p.PackageSearchMetadata.Identity.Version); + _latestVersionLabel.Text = highestVersionPackageFromSource.PackageSearchMetadata.Identity.Version.ToNormalizedString(); _sourceNamesContainer.QueueFreeChildren(); _ = Task.GodotRun(async () => { - var (iconBytes, iconFormat) = await _nugetPackageIconCacheService.GetNugetPackageIcon(PackageResult.PackageSearchMetadata.Identity.Id, PackageResult.PackageSearchMetadata.IconUrl); + var (iconBytes, iconFormat) = await _nugetPackageIconCacheService.GetNugetPackageIcon(PackageResult.PackageId, PackageResult.PackageFromSources.First().PackageSearchMetadata.IconUrl); var image = new Image(); var error = iconFormat switch { @@ -66,9 +68,9 @@ public partial class PackageEntry : MarginContainer } }); - foreach (var (index, source) in PackageResult.PackageSources.Index()) + foreach (var (index, packageFromSource) in PackageResult.PackageFromSources.Index()) { - var label = new Label { Text = source.Name }; + var label = new Label { Text = packageFromSource.Source.Name }; var labelColour = SourceColors[index % SourceColors.Length]; label.AddThemeColorOverride(ThemeStringNames.FontColor, labelColour); _sourceNamesContainer.AddChild(label);