From 04a467dd832992073501156795e126b71e71eff1 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 31 Mar 2024 15:59:43 +0100 Subject: [PATCH] registration and detail url's --- Makefile | 8 +++++--- src/isnd/Data/Catalog/PackageDetails.cs | 8 +++++--- src/isnd/Data/Packages/PackageVersion.cs | 3 +-- src/isnd/ViewModels/PackageSearchResult.cs | 4 +++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 156951c..cf34578 100644 --- a/Makefile +++ b/Makefile @@ -23,17 +23,19 @@ packs: pack-isn pack-isnd pack-isn.abst clean: clean-isnd clean-isn clean-isn.abst +TARGETFRAMEWORK=net8.0 + server-update: dotnet build -c Release src/isnd - dotnet publish -c Release -f net7.0 src/isnd + dotnet publish -c Release -f $(TARGETFRAMEWORK) src/isnd sudo systemctl stop isnd - sudo cp -a src/isnd/bin/Release/net7.0/publish/* /srv/www/isnd + sudo cp -a src/isnd/bin/Release/$(TARGETFRAMEWORK)/publish/* /srv/www/isnd sudo systemctl start isnd client-update: dotnet build -c Release src/isn # MAJ du client - sudo cp -a src/isn/bin/Release/net7.0/* /usr/local/lib/isn + sudo cp -a src/isn/bin/Release/$(TARGETFRAMEWORK)/* /usr/local/lib/isn sudo chown -R root:root /usr/local/lib/isn src/isn.abst/bin/Release/isn.abst.1.0.24.nupkg: diff --git a/src/isnd/Data/Catalog/PackageDetails.cs b/src/isnd/Data/Catalog/PackageDetails.cs index 82baeb4..b0cba95 100644 --- a/src/isnd/Data/Catalog/PackageDetails.cs +++ b/src/isnd/Data/Catalog/PackageDetails.cs @@ -12,6 +12,7 @@ using NuGet.Protocol; using NuGet.Packaging; using NuGet.Packaging.Core; using System.Threading.Tasks; +using isnd.Entities; namespace isnd.Data.Catalog { @@ -24,7 +25,7 @@ namespace isnd.Data.Catalog /// api Base /// package permalink /// - public PackageDetails(PackageVersion pkg, string apiBase, string uri): base(uri) + public PackageDetails(PackageVersion pkg, string apiBase): base( apiBase + ApiConfig.Registration + "/" + pkg.PackageId + "/" + pkg.FullString + ".json") { PackageId = pkg.Package.Id; Version = pkg.FullString; @@ -40,8 +41,9 @@ namespace isnd.Data.Catalog dependencyGroups = pkg.DependencyGroups.ToArray(); } } - - // TODO Licence Project Urls, Summary, Title, etc ... + PackageDetailsUrl = new Uri(this.id); + + // TODO Licence Project Urls, Summary, Title, Owners, etc ... } [JsonProperty("@type")] diff --git a/src/isnd/Data/Packages/PackageVersion.cs b/src/isnd/Data/Packages/PackageVersion.cs index b4d1eba..8d9ae0c 100644 --- a/src/isnd/Data/Packages/PackageVersion.cs +++ b/src/isnd/Data/Packages/PackageVersion.cs @@ -76,8 +76,7 @@ namespace isnd.Data public Catalog.Package ToPackage(string apiBase) { - return new Catalog.Package(apiBase, this.PackageId , FullString, - new Catalog.PackageDetails(this, apiBase, apiBase + ApiConfig.Registration + "/" + this.PackageId + "/" + FullString + ".json")); + return new Catalog.Package(apiBase, this.PackageId , FullString, new Catalog.PackageDetails(this, apiBase)); } public bool IsDeleted => LatestCommit?.Action == PackageAction.DeletePackage; diff --git a/src/isnd/ViewModels/PackageSearchResult.cs b/src/isnd/ViewModels/PackageSearchResult.cs index be117e2..b018dd1 100644 --- a/src/isnd/ViewModels/PackageSearchResult.cs +++ b/src/isnd/ViewModels/PackageSearchResult.cs @@ -37,7 +37,9 @@ namespace isnd.ViewModels version = package.GetLatestVersion(), description = package.Description, title = package.Id, - versions = package.Versions.Select(v => new SearchVersionInfo(regId, v)).ToArray() + versions = package.Versions.Select(v => new SearchVersionInfo(regId, v)).ToArray(), + registration = regId, + }; }