diff options
Diffstat (limited to 'routers/api/packages')
| -rw-r--r-- | routers/api/packages/api.go | 15 | ||||
| -rw-r--r-- | routers/api/packages/nuget/nuget.go | 53 |
2 files changed, 60 insertions, 8 deletions
diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 9f77367d6f..0e3d8b7a02 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -286,9 +286,18 @@ func CommonRoutes(ctx gocontext.Context) *web.Route { }, reqPackageAccess(perm.AccessModeWrite)) r.Get("/symbols/{filename}/{guid:[0-9a-fA-F]{32}[fF]{8}}/{filename2}", nuget.DownloadSymbolFile) r.Get("/Packages(Id='{id:[^']+}',Version='{version:[^']+}')", nuget.RegistrationLeafV2) - r.Get("/Packages()", nuget.SearchServiceV2) - r.Get("/FindPackagesById()", nuget.EnumeratePackageVersionsV2) - r.Get("/Search()", nuget.SearchServiceV2) + r.Group("/Packages()", func() { + r.Get("", nuget.SearchServiceV2) + r.Get("/$count", nuget.SearchServiceV2Count) + }) + r.Group("/FindPackagesById()", func() { + r.Get("", nuget.EnumeratePackageVersionsV2) + r.Get("/$count", nuget.EnumeratePackageVersionsV2Count) + }) + r.Group("/Search()", func() { + r.Get("", nuget.SearchServiceV2) + r.Get("/$count", nuget.SearchServiceV2Count) + }) }, reqPackageAccess(perm.AccessModeRead)) }) r.Group("/npm", func() { diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 6423db7d3a..3418bf9959 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -10,6 +10,7 @@ import ( "io" "net/http" "regexp" + "strconv" "strings" "code.gitea.io/gitea/models/db" @@ -94,8 +95,7 @@ func FeedCapabilityResource(ctx *context.Context) { var searchTermExtract = regexp.MustCompile(`'([^']+)'`) -// https://github.com/NuGet/NuGet.Client/blob/dev/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedQueryBuilder.cs -func SearchServiceV2(ctx *context.Context) { +func getSearchTerm(ctx *context.Context) string { searchTerm := strings.Trim(ctx.FormTrim("searchTerm"), "'") if searchTerm == "" { // $filter contains a query like: @@ -106,7 +106,11 @@ func SearchServiceV2(ctx *context.Context) { searchTerm = strings.TrimSpace(match[1]) } } + return searchTerm +} +// https://github.com/NuGet/NuGet.Client/blob/dev/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedQueryBuilder.cs +func SearchServiceV2(ctx *context.Context) { skip, take := ctx.FormInt("skip"), ctx.FormInt("take") if skip == 0 { skip = ctx.FormInt("$skip") @@ -116,9 +120,11 @@ func SearchServiceV2(ctx *context.Context) { } pvs, total, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{ - OwnerID: ctx.Package.Owner.ID, - Type: packages_model.TypeNuGet, - Name: packages_model.SearchValue{Value: searchTerm}, + OwnerID: ctx.Package.Owner.ID, + Type: packages_model.TypeNuGet, + Name: packages_model.SearchValue{ + Value: getSearchTerm(ctx), + }, IsInternal: util.OptionalBoolFalse, Paginator: db.NewAbsoluteListOptions( skip, @@ -145,6 +151,24 @@ func SearchServiceV2(ctx *context.Context) { xmlResponse(ctx, http.StatusOK, resp) } +// http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/part2-url-conventions/odata-v4.0-errata03-os-part2-url-conventions-complete.html#_Toc453752351 +func SearchServiceV2Count(ctx *context.Context) { + count, err := packages_model.CountVersions(ctx, &packages_model.PackageSearchOptions{ + OwnerID: ctx.Package.Owner.ID, + Type: packages_model.TypeNuGet, + Name: packages_model.SearchValue{ + Value: getSearchTerm(ctx), + }, + IsInternal: util.OptionalBoolFalse, + }) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + + ctx.PlainText(http.StatusOK, strconv.FormatInt(count, 10)) +} + // https://docs.microsoft.com/en-us/nuget/api/search-query-service-resource#search-for-packages func SearchServiceV3(ctx *context.Context) { pvs, count, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{ @@ -288,6 +312,25 @@ func EnumeratePackageVersionsV2(ctx *context.Context) { xmlResponse(ctx, http.StatusOK, resp) } +// http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/part2-url-conventions/odata-v4.0-errata03-os-part2-url-conventions-complete.html#_Toc453752351 +func EnumeratePackageVersionsV2Count(ctx *context.Context) { + count, err := packages_model.CountVersions(ctx, &packages_model.PackageSearchOptions{ + OwnerID: ctx.Package.Owner.ID, + Type: packages_model.TypeNuGet, + Name: packages_model.SearchValue{ + ExactMatch: true, + Value: strings.Trim(ctx.FormTrim("id"), "'"), + }, + IsInternal: util.OptionalBoolFalse, + }) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + + ctx.PlainText(http.StatusOK, strconv.FormatInt(count, 10)) +} + // https://docs.microsoft.com/en-us/nuget/api/package-base-address-resource#enumerate-package-versions func EnumeratePackageVersionsV3(ctx *context.Context) { packageName := ctx.Params("id") |