display package versions
This commit is contained in:
@@ -13,15 +13,14 @@ public record struct IdePackageFromSourceResult(IPackageSearchMetadata PackageSe
|
|||||||
public class NugetClientService
|
public class NugetClientService
|
||||||
{
|
{
|
||||||
private readonly bool _includePrerelease = false;
|
private readonly bool _includePrerelease = false;
|
||||||
|
private readonly SourceCacheContext _sourceCacheContext = new SourceCacheContext();
|
||||||
|
private readonly ILogger _nugetLogger = NullLogger.Instance;
|
||||||
public async Task<List<IdePackageResult>> GetTop100Results(string directoryPath, CancellationToken cancellationToken = default)
|
public async Task<List<IdePackageResult>> GetTop100Results(string directoryPath, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
var settings = Settings.LoadDefaultSettings(root: directoryPath);
|
var settings = Settings.LoadDefaultSettings(root: directoryPath);
|
||||||
var packageSourceProvider = new PackageSourceProvider(settings);
|
var packageSourceProvider = new PackageSourceProvider(settings);
|
||||||
var packageSources = packageSourceProvider.LoadPackageSources().Where(p => p.IsEnabled).ToList();
|
var packageSources = packageSourceProvider.LoadPackageSources().Where(p => p.IsEnabled).ToList();
|
||||||
|
|
||||||
var logger = NullLogger.Instance;
|
|
||||||
var cache = new SourceCacheContext();
|
|
||||||
|
|
||||||
var packagesResult = new List<IdePackageResult>();
|
var packagesResult = new List<IdePackageResult>();
|
||||||
|
|
||||||
foreach (var source in packageSources)
|
foreach (var source in packageSources)
|
||||||
@@ -38,7 +37,7 @@ public class NugetClientService
|
|||||||
filters: new SearchFilter(includePrerelease: _includePrerelease),
|
filters: new SearchFilter(includePrerelease: _includePrerelease),
|
||||||
skip: 0,
|
skip: 0,
|
||||||
take: 100,
|
take: 100,
|
||||||
log: logger,
|
log: _nugetLogger,
|
||||||
cancellationToken: cancellationToken).ConfigureAwait(false);
|
cancellationToken: cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
packagesResult.AddRange(results.Select(s => new IdePackageResult(s.Identity.Id, [new IdePackageFromSourceResult(s, source)])));
|
packagesResult.AddRange(results.Select(s => new IdePackageResult(s.Identity.Id, [new IdePackageFromSourceResult(s, source)])));
|
||||||
@@ -80,7 +79,7 @@ public class NugetClientService
|
|||||||
filters: new SearchFilter(includePrerelease: _includePrerelease),
|
filters: new SearchFilter(includePrerelease: _includePrerelease),
|
||||||
skip: 0,
|
skip: 0,
|
||||||
take: 2,
|
take: 2,
|
||||||
log: logger,
|
log: _nugetLogger,
|
||||||
cancellationToken: cancellationToken).ConfigureAwait(false);
|
cancellationToken: cancellationToken).ConfigureAwait(false);
|
||||||
var foundPackage = results.SingleOrDefault(r => r.Identity.Id.Equals(package.PackageId, StringComparison.OrdinalIgnoreCase));
|
var foundPackage = results.SingleOrDefault(r => r.Identity.Id.Equals(package.PackageId, StringComparison.OrdinalIgnoreCase));
|
||||||
if (foundPackage != null)
|
if (foundPackage != null)
|
||||||
@@ -92,4 +91,17 @@ public class NugetClientService
|
|||||||
|
|
||||||
return topPackages;
|
return topPackages;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<List<IPackageSearchMetadata>> GetAllVersionsOfPackageInSource(string packageId, PackageSource source, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
var repository = Repository.Factory.GetCoreV3(source);
|
||||||
|
var packageMetadataResource = await repository.GetResourceAsync<PackageMetadataResource>(cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
var metadata = await packageMetadataResource.GetMetadataAsync(
|
||||||
|
packageId, includePrerelease: _includePrerelease, includeUnlisted: false,
|
||||||
|
_sourceCacheContext, _nugetLogger, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
//var packageByIdResource = await repository.GetResourceAsync<FindPackageByIdResource>(cancellationToken).ConfigureAwait(false);
|
||||||
|
return metadata.ToList();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ public class NugetPackageIconCacheService(IHttpClientFactory httpClientFactory)
|
|||||||
{
|
{
|
||||||
private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
|
private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
|
||||||
|
|
||||||
|
// TODO: Add an in memory cache
|
||||||
public async Task<(byte[]? bytes, NugetPackageIconFormat?)> GetNugetPackageIcon(string packageId, Uri? iconUrl)
|
public async Task<(byte[]? bytes, NugetPackageIconFormat?)> GetNugetPackageIcon(string packageId, Uri? iconUrl)
|
||||||
{
|
{
|
||||||
var appdataFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
var appdataFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
||||||
|
|||||||
@@ -7,18 +7,24 @@ public partial class NugetPackageDetails : VBoxContainer
|
|||||||
{
|
{
|
||||||
private TextureRect _packageIconTextureRect = null!;
|
private TextureRect _packageIconTextureRect = null!;
|
||||||
private Label _packageNameLabel = null!;
|
private Label _packageNameLabel = null!;
|
||||||
|
private OptionButton _versionOptionButton = null!;
|
||||||
|
private OptionButton _nugetSourceOptionButton = null!;
|
||||||
|
|
||||||
private IdePackageResult? _package;
|
private IdePackageResult? _package;
|
||||||
|
|
||||||
private readonly Texture2D _defaultIconTextureRect = ResourceLoader.Load<Texture2D>("uid://b5ih61vdjv5e6");
|
private readonly Texture2D _defaultIconTextureRect = ResourceLoader.Load<Texture2D>("uid://b5ih61vdjv5e6");
|
||||||
|
|
||||||
[Inject] private readonly NugetPackageIconCacheService _nugetPackageIconCacheService = null!;
|
[Inject] private readonly NugetPackageIconCacheService _nugetPackageIconCacheService = null!;
|
||||||
|
[Inject] private readonly NugetClientService _nugetClientService = null!;
|
||||||
public override void _Ready()
|
public override void _Ready()
|
||||||
{
|
{
|
||||||
_packageIconTextureRect = GetNode<TextureRect>("%PackageIconTextureRect");
|
_packageIconTextureRect = GetNode<TextureRect>("%PackageIconTextureRect");
|
||||||
_packageNameLabel = GetNode<Label>("%PackageNameLabel");
|
_packageNameLabel = GetNode<Label>("%PackageNameLabel");
|
||||||
|
_versionOptionButton = GetNode<OptionButton>("%VersionOptionButton");
|
||||||
|
_nugetSourceOptionButton = GetNode<OptionButton>("%NugetSourceOptionButton");
|
||||||
|
_nugetSourceOptionButton.ItemSelected += OnNugetSourceSelected;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SetPackage(IdePackageResult package)
|
public async Task SetPackage(IdePackageResult package)
|
||||||
{
|
{
|
||||||
_package = package;
|
_package = package;
|
||||||
@@ -30,6 +36,37 @@ public partial class NugetPackageDetails : VBoxContainer
|
|||||||
});
|
});
|
||||||
var (iconBytes, iconFormat) = await iconTask;
|
var (iconBytes, iconFormat) = await iconTask;
|
||||||
var imageTexture = ImageTextureHelper.GetImageTextureFromBytes(iconBytes, iconFormat) ?? _defaultIconTextureRect;
|
var imageTexture = ImageTextureHelper.GetImageTextureFromBytes(iconBytes, iconFormat) ?? _defaultIconTextureRect;
|
||||||
await this.InvokeAsync(() => _packageIconTextureRect.Texture = imageTexture);
|
await this.InvokeAsync(() =>
|
||||||
|
{
|
||||||
|
_packageIconTextureRect.Texture = imageTexture;
|
||||||
|
|
||||||
|
_versionOptionButton.Clear();
|
||||||
|
_nugetSourceOptionButton.Clear();
|
||||||
|
foreach (var packageFromSource in package.PackageFromSources)
|
||||||
|
{
|
||||||
|
_nugetSourceOptionButton.AddItem(packageFromSource.Source.Name);
|
||||||
|
}
|
||||||
|
_nugetSourceOptionButton.Selected = 0;
|
||||||
|
OnNugetSourceSelected(0);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void OnNugetSourceSelected(long index)
|
||||||
|
{
|
||||||
|
var source = _package!.PackageFromSources[(int)index];
|
||||||
|
var results = await _nugetClientService.GetAllVersionsOfPackageInSource(source.PackageSearchMetadata.Identity.Id, source.Source);
|
||||||
|
await this.InvokeAsync(() =>
|
||||||
|
{
|
||||||
|
_versionOptionButton.Clear();
|
||||||
|
var versions = results
|
||||||
|
.Select(p => p.Identity.Version)
|
||||||
|
.Distinct()
|
||||||
|
.OrderByDescending(v => v);
|
||||||
|
foreach (var version in versions)
|
||||||
|
{
|
||||||
|
_versionOptionButton.AddItem(version.ToNormalizedString());
|
||||||
|
}
|
||||||
|
_versionOptionButton.Selected = 0;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user