mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 05:18:25 +00:00 
			
		
		
		
	Refactor names (#31405)
This PR only does "renaming": * `Route` should be `Router` (and chi router is also called "router") * `Params` should be `PathParam` (to distingush it from URL query param, and to match `FormString`) * Use lower case for private functions to avoid exposing or abusing
This commit is contained in:
		@@ -43,8 +43,8 @@ func apiError(ctx *context.Context, status int, obj any) {
 | 
			
		||||
// packageNameFromParams gets the package name from the url parameters
 | 
			
		||||
// Variations: /name/, /@scope/name/, /@scope%2Fname/
 | 
			
		||||
func packageNameFromParams(ctx *context.Context) string {
 | 
			
		||||
	scope := ctx.Params("scope")
 | 
			
		||||
	id := ctx.Params("id")
 | 
			
		||||
	scope := ctx.PathParam("scope")
 | 
			
		||||
	id := ctx.PathParam("id")
 | 
			
		||||
	if scope != "" {
 | 
			
		||||
		return fmt.Sprintf("@%s/%s", scope, id)
 | 
			
		||||
	}
 | 
			
		||||
@@ -82,8 +82,8 @@ func PackageMetadata(ctx *context.Context) {
 | 
			
		||||
// DownloadPackageFile serves the content of a package
 | 
			
		||||
func DownloadPackageFile(ctx *context.Context) {
 | 
			
		||||
	packageName := packageNameFromParams(ctx)
 | 
			
		||||
	packageVersion := ctx.Params("version")
 | 
			
		||||
	filename := ctx.Params("filename")
 | 
			
		||||
	packageVersion := ctx.PathParam("version")
 | 
			
		||||
	filename := ctx.PathParam("filename")
 | 
			
		||||
 | 
			
		||||
	s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion(
 | 
			
		||||
		ctx,
 | 
			
		||||
@@ -111,7 +111,7 @@ func DownloadPackageFile(ctx *context.Context) {
 | 
			
		||||
 | 
			
		||||
// DownloadPackageFileByName finds the version and serves the contents of a package
 | 
			
		||||
func DownloadPackageFileByName(ctx *context.Context) {
 | 
			
		||||
	filename := ctx.Params("filename")
 | 
			
		||||
	filename := ctx.PathParam("filename")
 | 
			
		||||
 | 
			
		||||
	pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
 | 
			
		||||
		OwnerID: ctx.Package.Owner.ID,
 | 
			
		||||
@@ -254,7 +254,7 @@ func DeletePreview(ctx *context.Context) {
 | 
			
		||||
// DeletePackageVersion deletes the package version
 | 
			
		||||
func DeletePackageVersion(ctx *context.Context) {
 | 
			
		||||
	packageName := packageNameFromParams(ctx)
 | 
			
		||||
	packageVersion := ctx.Params("version")
 | 
			
		||||
	packageVersion := ctx.PathParam("version")
 | 
			
		||||
 | 
			
		||||
	err := packages_service.RemovePackageVersionByNameAndVersion(
 | 
			
		||||
		ctx,
 | 
			
		||||
@@ -349,7 +349,7 @@ func AddPackageTag(ctx *context.Context) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if err := setPackageTag(ctx, ctx.Params("tag"), pv, false); err != nil {
 | 
			
		||||
	if err := setPackageTag(ctx, ctx.PathParam("tag"), pv, false); err != nil {
 | 
			
		||||
		if err == errInvalidTagName {
 | 
			
		||||
			apiError(ctx, http.StatusBadRequest, err)
 | 
			
		||||
			return
 | 
			
		||||
@@ -370,7 +370,7 @@ func DeletePackageTag(ctx *context.Context) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if len(pvs) != 0 {
 | 
			
		||||
		if err := setPackageTag(ctx, ctx.Params("tag"), pvs[0], true); err != nil {
 | 
			
		||||
		if err := setPackageTag(ctx, ctx.PathParam("tag"), pvs[0], true); err != nil {
 | 
			
		||||
			if err == errInvalidTagName {
 | 
			
		||||
				apiError(ctx, http.StatusBadRequest, err)
 | 
			
		||||
				return
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user