paul/isn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catalog++

Browse Source
This commit is contained in:
Paul Schneider
2022-09-24 12:32:00 +01:00
parent 58f49af5f0
commit fcea41f8c1
8 changed files with 48 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/isnd/Controllers/Packages/Catalog.cs
View File

@ -24,24 +24,20 @@ namespace isnd.Controllers
return Ok(PackageManager.CurrentCatalogPages[int.Parse(id)]);
}
[HttpGet(_pkgRootPrefix + "{apiVersion}/" + ApiConfig.Registration
+ "/{id}/index.json")]
public async Task<IActionResult> CatalogRegistrationAsync(string apiVersion, string id, string lower)
[HttpGet(_pkgRootPrefix + "{apiVersion}/" + ApiConfig.Registration + "/{id}/index.json")]
public async Task<IActionResult> CatalogRegistrationAsync(string apiVersion, string id)
{
var pkgs = packageManager.SearchById(id, null, null);
if (pkgs == null) return NotFound();
return Ok(pkgs);
}
[HttpGet(_pkgRootPrefix + ApiConfig.CatalogLeaf + "/{id}/{version}/{lower}/index.json")]
public async Task<IActionResult> CatalogLeafAsync(string id, string pversion, string lower)
{
bool askForindex = lower == null;
if (askForindex)
{
string sublower = lower.Substring(0, lower.Length - ApiConfig.IndexDotJson.Length);
var pkgFromname = packageManager.SearchByName(id, 0, 1);
if (pkgFromname == null) return NotFound();
foreach (var item in pkgFromname.Items)
{
item.Id = this.Url.Action();
}
return Ok(pkgFromname);
}
else
if (false)
{
if (!NuGetVersion.TryParse(lower, out NuGetVersion version))
return BadRequest(lower);
@ -50,12 +46,7 @@ namespace isnd.Controllers
if (pkgFromname == null) return NotFound();
return Ok(pkgFromname);
}
}
[HttpGet(_pkgRootPrefix + ApiConfig.CatalogLeaf + "/{id}/{version}/{lower}/index.json")]
public async Task<IActionResult> CatalogLeafAsync(string id, string version, string lower)
{
var pkgvs = this.packageManager.GetCatalogLeaf(id, version, lower).ToArray();
var pkgvs = this.packageManager.GetCatalogLeaf(id, pversion, lower).ToArray();
if (pkgvs.Count() == 0) return NotFound();
List<string> types = pkgvs.Select(
v => v.Type ?? "Dependency"

2
src/isnd/Data/Packages/Package.cs
View File

@ -51,7 +51,7 @@ namespace isnd.Data.Packages
/// </summary>
/// <param name="bid">base url tu use for building the id property</param>
/// <returns></returns>
internal RegistrationLeaf ToLeave(string bid)
public RegistrationLeaf ToLeave(string bid)
{
if (Versions.Count == 0) throw new Exception("NO VERSION");
var v = Versions.First();

1
src/isnd/Data/Packages/PackageVersion.cs
View File

@ -49,5 +49,6 @@ namespace isnd.Data
public string NuspecLink => $"/{Constants.SpecFileEstension}/{PackageId}/{FullString}/{PackageId}-{FullString}."
+ Constants.SpecFileEstension;
public string SementicVersionString { get => $"{Major}.{Minor}.{Patch}"; }
}
}

4
src/isnd/Helpers/SiteHelpers.cs
View File

@ -2,6 +2,10 @@ namespace isnd.Helpers
{
public static class SiteHelpers
{
/// <summary>
/// The Git Sementic version (from GitVersion.MsBuild)[published]
/// </summary>
/// <value></value>
public static string SemVer {
get => GitVersionInformation.SemVer;
}

5
src/isnd/Interfaces/IPackageManager.cs
View File

@ -24,9 +24,10 @@ namespace isnd.Interfaces
IEnumerable<Resource> GetResources(IUnleash unleashĈlient);
void ÛpdateCatalogFor(Commit commit);
Task<PackageDeletionReport> DeletePackageAsync(string pkgid, string version, string type);
Task<PackageDeletionReport> UserAskForPackageDeletionAsync(string uid, string id, string lower, string type);
Task<PackageDeletionReport> UserAskForPackageDeletionAsync(string userid, string pkgId, string lower, string type);
Task<PackageVersion> GetPackageAsync(string pkgid, string version, string type);
IEnumerable<PackageVersion> GetCatalogLeaf(string id, string version, string lower);
IEnumerable<PackageVersion> GetCatalogLeaf(string pkgId, string semver, string pkgType);
IEnumerable<RegistrationLeaf> SearchById(string pkgId, string semver, string pkgType);
}
}

26
src/isnd/Services/PackageManager.cs
View File

@ -323,13 +323,15 @@ namespace isnd.Services
);
}
public IEnumerable<PackageVersion> GetCatalogLeaf(string id, string version, string lower)
public IEnumerable<PackageVersion> GetCatalogLeaf(string pkgId, string semver, string pkgType)
{
return dbContext.PackageVersions
.Include(v => v.Package)
.Include(v => v.LatestCommit)
.Where(v => v.PackageId == id && v.FullString == version
&& (lower == null || lower == v.Type));
.Where(v => v.PackageId == pkgId
&& (semver == null ||
semver.StartsWith(v.SementicVersionString))
&& (pkgType == null || pkgType == v.Type));
}
@ -344,5 +346,23 @@ namespace isnd.Services
if (packageVersion.Package.OwnerId != uid) return null;
return new PackageDeletionReport { Deleted = true, DeletedVersion = packageVersion };
}
public IEnumerable<Data.Catalog.RegistrationLeaf> SearchById(string pkgId, string semver, string pkgType)
{
string bid = $"{extUrl}v3.4.0/{ApiConfig.Registration}/";
return dbContext.PackageVersions
.Include(v => v.Package)
.Include(v => v.LatestCommit)
.Where(v => v.PackageId == pkgId && semver.StartsWith(v.SementicVersionString)
&& (pkgType == null || pkgType == v.Type)).Select(p => p.Package.ToLeave(bid));
}
public PackageVersion GetPackage(string pkgId, string semver, string pkgType)
{
return dbContext.PackageVersions
.Include(v => v.Package)
.Include(v => v.LatestCommit)
.Single(v => v.PackageId == pkgId && semver == v.FullString
&& (pkgType == null || pkgType == v.Type));
}
}
}

45
src/isnd/ViewModels/RegistrationLeaf.cs
View File

@ -1,45 +0,0 @@
using isnd.Data.Packages;
namespace isnd.ViewModels
{
public class RegistrationLeaf
{
/*
@id string yes The URL to the registration leaf
catalogEntry object yes The catalog entry containing the package metadata
packageContent string yes The URL to the package content (.nupkg)
*/
public static RegistrationLeaf FromPackage(Package p)
{
RegistrationLeaf v = new RegistrationLeaf
{
};
return v;
}
}
public class CatalogEntry
{
/*
@id string yes The URL to the document used to produce this object
authors string or array of strings no
dependencyGroups array of objects no The dependencies of the package, grouped by target framework
deprecation object no The deprecation associated with the package
description string no
iconUrl string no
id string yes The ID of the package
licenseUrl string no
licenseExpression string no
listed boolean no Should be considered as listed if absent
minClientVersion string no
projectUrl string no
published string no A string containing a ISO 8601 timestamp of when the package was published
requireLicenseAcceptance boolean no
summary string no
tags string or array of string no
title string no
version string yes The full version string after normalization
vulnerabilities array of objects no The security vulnerabilities of the package
*/
}
}

6
src/isnd/isnd.csproj
View File

@ -17,9 +17,9 @@
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="2.1.11" />
<PackageReference Include="Microsoft.AspNetCore.All" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="NuGet.Packaging.Core" Version="5.9.0" />
<PackageReference Include="NuGet.Packaging.Core" Version="5.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.30" />
<PackageReference Include="MailKit" Version="2.11.1" />
<PackageReference Include="MailKit" Version="2.8.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" IncludeAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.14" IncludeAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.10" IncludeAssets="All" />
@ -28,7 +28,7 @@
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10*">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
</ItemGroup>
<ItemGroup>