Skip to content

Commit 591a0f2

Browse files
wxiaoguangwxiaoguang
committed
make maven package search legacy package names
1 parent 2f5d355 commit 591a0f2

File tree

11 files changed

+61
-87
lines changed

11 files changed

+61
-87
lines changed

‎models/packages/package_version.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ func GetVersionsByPackageName(ctx context.Context, ownerID int64, packageType Ty
139139
},
140140
IsInternal: optional.Some(false),
141141
})
142-
143-
if len(pvs) == 0 {
144-
return nil, util.ErrNotExist
145-
}
146-
147142
return pvs, err
148143
}
149144

‎routers/api/packages/chef/chef.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,14 @@ func PackageMetadata(ctx *context.Context) {
153153
packageName := ctx.PathParam("name")
154154

155155
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, packageName)
156-
if errors.Is(err, util.ErrNotExist) {
157-
apiError(ctx, http.StatusNotFound, nil)
158-
return
159-
}
160-
161156
if err != nil {
162157
apiError(ctx, http.StatusInternalServerError, err)
163158
return
164159
}
160+
if len(pvs) == 0 {
161+
apiError(ctx, http.StatusNotFound, nil)
162+
return
163+
}
165164

166165
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
167166
if err != nil {
@@ -383,13 +382,13 @@ func DeletePackageVersion(ctx *context.Context) {
383382
// https://github.com/chef/chef/blob/main/knife/lib/chef/knife/supermarket_unshare.rb
384383
func DeletePackage(ctx *context.Context) {
385384
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, ctx.PathParam("name"))
386-
if errors.Is(err, util.ErrNotExist) {
387-
apiError(ctx, http.StatusNotFound, err)
385+
if err != nil {
386+
apiError(ctx, http.StatusInternalServerError, err)
388387
return
389388
}
390389

391-
if err != nil {
392-
apiError(ctx, http.StatusInternalServerError, err)
390+
if len(pvs) == 0 {
391+
apiError(ctx, http.StatusNotFound, err)
393392
return
394393
}
395394

‎routers/api/packages/composer/composer.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,14 @@ func PackageMetadata(ctx *context.Context) {
138138
projectName := ctx.PathParam("projectname")
139139

140140
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeComposer, vendorName+"/"+projectName)
141-
if errors.Is(err, util.ErrNotExist) {
142-
apiError(ctx, http.StatusNotFound, packages_model.ErrPackageNotExist)
143-
return
144-
}
145-
146141
if err != nil {
147142
apiError(ctx, http.StatusInternalServerError, err)
148143
return
149144
}
145+
if len(pvs) == 0 {
146+
apiError(ctx, http.StatusNotFound, packages_model.ErrPackageNotExist)
147+
return
148+
}
150149

151150
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
152151
if err != nil {

‎routers/api/packages/goproxy/goproxy.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ func apiError(ctx *context.Context, status int, obj any) {
2929

3030
func EnumeratePackageVersions(ctx *context.Context) {
3131
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeGo, ctx.PathParam("name"))
32-
if errors.Is(err, util.ErrNotExist) {
33-
apiError(ctx, http.StatusNotFound, err)
34-
return
35-
}
3632
if err != nil {
3733
apiError(ctx, http.StatusInternalServerError, err)
3834
return
3935
}
36+
if len(pvs) == 0 {
37+
apiError(ctx, http.StatusNotFound, err)
38+
return
39+
}
4040

4141
sort.Slice(pvs, func(i, j int) bool {
4242
return pvs[i].CreatedUnix < pvs[j].CreatedUnix

‎routers/api/packages/npm/npm.go‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,14 @@ func PackageMetadata(ctx *context.Context) {
5656
packageName := packageNameFromParams(ctx)
5757

5858
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNpm, packageName)
59-
if errors.Is(err, util.ErrNotExist) {
60-
apiError(ctx, http.StatusNotFound, err)
61-
return
62-
}
63-
6459
if err != nil {
6560
apiError(ctx, http.StatusInternalServerError, err)
6661
return
6762
}
63+
if len(pvs) == 0 {
64+
apiError(ctx, http.StatusNotFound, err)
65+
return
66+
}
6867

6968
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
7069
if err != nil {
@@ -284,13 +283,13 @@ func DeletePackage(ctx *context.Context) {
284283
packageName := packageNameFromParams(ctx)
285284

286285
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNpm, packageName)
287-
if errors.Is(err, util.ErrNotExist) {
288-
apiError(ctx, http.StatusNotFound, err)
286+
if err != nil {
287+
apiError(ctx, http.StatusInternalServerError, err)
289288
return
290289
}
291290

292-
if err != nil {
293-
apiError(ctx, http.StatusInternalServerError, err)
291+
if len(pvs) == 0 {
292+
apiError(ctx, http.StatusNotFound, err)
294293
return
295294
}
296295

@@ -309,10 +308,6 @@ func ListPackageTags(ctx *context.Context) {
309308
packageName := packageNameFromParams(ctx)
310309

311310
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNpm, packageName)
312-
if errors.Is(err, util.ErrNotExist) {
313-
apiError(ctx, http.StatusNotFound, err)
314-
return
315-
}
316311
if err != nil {
317312
apiError(ctx, http.StatusInternalServerError, err)
318313
return
@@ -369,10 +364,6 @@ func DeletePackageTag(ctx *context.Context) {
369364
packageName := packageNameFromParams(ctx)
370365

371366
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNpm, packageName)
372-
if errors.Is(err, util.ErrNotExist) {
373-
return
374-
}
375-
376367
if err != nil {
377368
apiError(ctx, http.StatusInternalServerError, err)
378369
return

‎routers/api/packages/nuget/nuget.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,14 @@ func RegistrationIndex(ctx *context.Context) {
229229
packageName := ctx.PathParam("id")
230230

231231
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName)
232-
if errors.Is(err, util.ErrNotExist) {
233-
apiError(ctx, http.StatusNotFound, err)
234-
return
235-
}
236-
237232
if err != nil {
238233
apiError(ctx, http.StatusInternalServerError, err)
239234
return
240235
}
236+
if len(pvs) == 0 {
237+
apiError(ctx, http.StatusNotFound, err)
238+
return
239+
}
241240

242241
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
243242
if err != nil {
@@ -385,15 +384,14 @@ func EnumeratePackageVersionsV3(ctx *context.Context) {
385384
packageName := ctx.PathParam("id")
386385

387386
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName)
388-
if errors.Is(err, util.ErrNotExist) {
389-
apiError(ctx, http.StatusNotFound, err)
390-
return
391-
}
392-
393387
if err != nil {
394388
apiError(ctx, http.StatusInternalServerError, err)
395389
return
396390
}
391+
if len(pvs) == 0 {
392+
apiError(ctx, http.StatusNotFound, err)
393+
return
394+
}
397395

398396
resp := createPackageVersionsResponse(pvs)
399397

‎routers/api/packages/pub/pub.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,14 @@ func EnumeratePackageVersions(ctx *context.Context) {
8484
packageName := ctx.PathParam("id")
8585

8686
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypePub, packageName)
87-
if errors.Is(err, util.ErrNotExist) {
88-
apiError(ctx, http.StatusNotFound, err)
89-
return
90-
}
91-
9287
if err != nil {
9388
apiError(ctx, http.StatusInternalServerError, err)
9489
return
9590
}
91+
if len(pvs) == 0 {
92+
apiError(ctx, http.StatusNotFound, err)
93+
return
94+
}
9695

9796
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
9897
if err != nil {

‎routers/api/packages/pypi/pypi.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
packages_module "code.gitea.io/gitea/modules/packages"
1818
pypi_module "code.gitea.io/gitea/modules/packages/pypi"
1919
"code.gitea.io/gitea/modules/setting"
20-
"code.gitea.io/gitea/modules/util"
2120
"code.gitea.io/gitea/modules/validation"
2221
"code.gitea.io/gitea/routers/api/packages/helper"
2322
"code.gitea.io/gitea/services/context"
@@ -51,15 +50,14 @@ func PackageMetadata(ctx *context.Context) {
5150
packageName := normalizer.Replace(ctx.PathParam("id"))
5251

5352
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypePyPI, packageName)
54-
if errors.Is(err, util.ErrNotExist) {
55-
apiError(ctx, http.StatusNotFound, err)
56-
return
57-
}
58-
5953
if err != nil {
6054
apiError(ctx, http.StatusInternalServerError, err)
6155
return
6256
}
57+
if len(pvs) == 0 {
58+
apiError(ctx, http.StatusNotFound, err)
59+
return
60+
}
6361

6462
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
6563
if err != nil {

‎routers/api/packages/rubygems/rubygems.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,14 @@ func DeletePackage(ctx *context.Context) {
301301
func GetPackageInfo(ctx *context.Context) {
302302
packageName := ctx.PathParam("packagename")
303303
versions, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeRubyGems, packageName)
304-
if errors.Is(err, util.ErrNotExist) {
305-
apiError(ctx, http.StatusNotFound, nil)
306-
return
307-
}
308-
309304
if err != nil {
310305
apiError(ctx, http.StatusInternalServerError, err)
311306
return
312307
}
313-
308+
if len(versions) == 0 {
309+
apiError(ctx, http.StatusNotFound, nil)
310+
return
311+
}
314312
infoContent, err := makePackageInfo(ctx, versions)
315313
if err != nil {
316314
apiError(ctx, http.StatusInternalServerError, err)
@@ -332,12 +330,13 @@ func GetAllPackagesVersions(ctx *context.Context) {
332330
out.WriteString("---\n")
333331
for _, pkg := range packages {
334332
versions, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeRubyGems, pkg.Name)
335-
if errors.Is(err, util.ErrNotExist) {
336-
continue
337-
} else if err != nil {
333+
if err != nil {
338334
apiError(ctx, http.StatusInternalServerError, err)
339335
return
340336
}
337+
if len(versions) == 0 {
338+
continue
339+
}
341340

342341
info, err := makePackageInfo(ctx, versions)
343342
if err != nil {

‎routers/api/packages/swift/swift.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,14 @@ func EnumeratePackageVersions(ctx *context.Context) {
129129
packageName := ctx.PathParam("name")
130130

131131
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, buildPackageID(packageScope, packageName))
132-
if errors.Is(err, util.ErrNotExist) {
133-
apiError(ctx, http.StatusNotFound, nil)
134-
return
135-
}
136-
137132
if err != nil {
138133
apiError(ctx, http.StatusInternalServerError, err)
139134
return
140135
}
136+
if len(pvs) == 0 {
137+
apiError(ctx, http.StatusNotFound, nil)
138+
return
139+
}
141140

142141
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
143142
if err != nil {

0 commit comments

Comments
 (0)