From 4130feb1240dae180fc84f6f0c73ef2f7174fbf5 Mon Sep 17 00:00:00 2001 From: imgurbot12 Date: Wed, 29 Oct 2025 00:26:57 -0700 Subject: [PATCH 1/2] feat: new generic package version/file enumeration api endpoint --- routers/api/packages/api.go | 1 + routers/api/packages/generic/generic.go | 60 +++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index f6ee5958b5bb9..bea5c385e1e31 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -336,6 +336,7 @@ func CommonRoutes() *web.Router { }) }, reqPackageAccess(perm.AccessModeRead)) r.Group("/generic", func() { + r.Get("/{packagename}/list", generic.EnumeratePackageVersions) r.Group("/{packagename}/{packageversion}", func() { r.Delete("", reqPackageAccess(perm.AccessModeWrite), generic.DeletePackage) r.Group("/{filename}", func() { diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index 5eb189e6d9c7b..1252c6868d5e8 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -12,6 +12,7 @@ import ( packages_model "code.gitea.io/gitea/models/packages" packages_module "code.gitea.io/gitea/modules/packages" + "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/routers/api/packages/helper" "code.gitea.io/gitea/services/context" packages_service "code.gitea.io/gitea/services/packages" @@ -22,11 +23,70 @@ var ( filenameRegex = regexp.MustCompile(`\A[-_+=:;.()\[\]{}~!@#$%^& \w]+\z`) ) +// GenericPackageFileInfo represents information about an existing package file +// swagger:model +type GenericPackageFileInfo struct { + // Name of package file + Name string `json:"name"` + // swagger:strfmt date-time + // Date when package file was created/uploaded + CreatedUnix timeutil.TimeStamp `json:"created"` +} + +// GenericPackageInfo represents information about an existing package file +// swagger:model +type GenericPackageInfo struct { + /// Version linked to package information + Version string `json:"version"` + /// Download count for files within version + DownloadCount int64 `json:"downloads"` + /// Files uploaded for package version + Files []GenericPackageFileInfo `json:"files"` +} + func apiError(ctx *context.Context, status int, obj any) { message := helper.ProcessErrorForUser(ctx, status, obj) ctx.PlainText(status, message) } +// EnumeratePackageVersions lists upload versions and their associated files +func EnumeratePackageVersions(ctx *context.Context) { + pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeGeneric, ctx.PathParam("packagename")) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + if len(pvs) == 0 { + apiError(ctx, http.StatusNotFound, err) + return + } + + var info []GenericPackageInfo + for _, pv := range pvs { + packageFiles, err := packages_model.GetFilesByVersionID(ctx, pv.ID) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + + var files []GenericPackageFileInfo + for _, file := range packageFiles { + files = append(files, GenericPackageFileInfo{ + Name: file.Name, + CreatedUnix: file.CreatedUnix, + }) + } + + info = append(info, GenericPackageInfo{ + Version: pv.Version, + DownloadCount: pv.DownloadCount, + Files: files, + }) + } + + ctx.JSON(http.StatusOK, info) +} + // DownloadPackageFile serves the specific generic package. func DownloadPackageFile(ctx *context.Context) { s, u, pf, err := packages_service.OpenFileForDownloadByPackageNameAndVersion( From b4efc0e726e2ab52e7f518ccba5036bf69740fce Mon Sep 17 00:00:00 2001 From: imgurbot12 Date: Wed, 29 Oct 2025 00:49:23 -0700 Subject: [PATCH 2/2] fix: i forgor to run lint again after changing the struct names. unchanged the names --- routers/api/packages/generic/generic.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index 1252c6868d5e8..a410dfda51132 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -23,9 +23,9 @@ var ( filenameRegex = regexp.MustCompile(`\A[-_+=:;.()\[\]{}~!@#$%^& \w]+\z`) ) -// GenericPackageFileInfo represents information about an existing package file +// PackageFileInfo represents information about an existing package file // swagger:model -type GenericPackageFileInfo struct { +type PackageFileInfo struct { // Name of package file Name string `json:"name"` // swagger:strfmt date-time @@ -33,15 +33,15 @@ type GenericPackageFileInfo struct { CreatedUnix timeutil.TimeStamp `json:"created"` } -// GenericPackageInfo represents information about an existing package file +// PackageInfo represents information about an existing package file // swagger:model -type GenericPackageInfo struct { +type PackageInfo struct { /// Version linked to package information Version string `json:"version"` /// Download count for files within version DownloadCount int64 `json:"downloads"` /// Files uploaded for package version - Files []GenericPackageFileInfo `json:"files"` + Files []PackageFileInfo `json:"files"` } func apiError(ctx *context.Context, status int, obj any) { @@ -61,7 +61,7 @@ func EnumeratePackageVersions(ctx *context.Context) { return } - var info []GenericPackageInfo + var info []PackageInfo for _, pv := range pvs { packageFiles, err := packages_model.GetFilesByVersionID(ctx, pv.ID) if err != nil { @@ -69,15 +69,15 @@ func EnumeratePackageVersions(ctx *context.Context) { return } - var files []GenericPackageFileInfo + var files []PackageFileInfo for _, file := range packageFiles { - files = append(files, GenericPackageFileInfo{ + files = append(files, PackageFileInfo{ Name: file.Name, CreatedUnix: file.CreatedUnix, }) } - info = append(info, GenericPackageInfo{ + info = append(info, PackageInfo{ Version: pv.Version, DownloadCount: pv.DownloadCount, Files: files,