diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-06-19 06:32:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-19 06:32:45 +0800 |
| commit | 43c7a2e7b1c7fb8aa2347d82ad0a6886d6fad9c2 (patch) | |
| tree | c98c2e1159ee02eb52282811f28a4c31ad222c67 /routers/api/packages/conan/conan.go | |
| parent | 17baf1af10de025a47ade1f16f1e5c51646d7fcf (diff) | |
| download | gitea-43c7a2e7b1c7fb8aa2347d82ad0a6886d6fad9c2.tar.gz gitea-43c7a2e7b1c7fb8aa2347d82ad0a6886d6fad9c2.zip | |
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
Diffstat (limited to 'routers/api/packages/conan/conan.go')
| -rw-r--r-- | routers/api/packages/conan/conan.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index 07ea3eda34..7afca2fab1 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -72,11 +72,11 @@ func baseURL(ctx *context.Context) string { // ExtractPathParameters is a middleware to extract common parameters from path func ExtractPathParameters(ctx *context.Context) { rref, err := conan_module.NewRecipeReference( - ctx.Params("name"), - ctx.Params("version"), - ctx.Params("user"), - ctx.Params("channel"), - ctx.Params("recipe_revision"), + ctx.PathParam("name"), + ctx.PathParam("version"), + ctx.PathParam("user"), + ctx.PathParam("channel"), + ctx.PathParam("recipe_revision"), ) if err != nil { apiError(ctx, http.StatusBadRequest, err) @@ -85,14 +85,14 @@ func ExtractPathParameters(ctx *context.Context) { ctx.Data[recipeReferenceKey] = rref - reference := ctx.Params("package_reference") + reference := ctx.PathParam("package_reference") var pref *conan_module.PackageReference if reference != "" { pref, err = conan_module.NewPackageReference( rref, reference, - ctx.Params("package_revision"), + ctx.PathParam("package_revision"), ) if err != nil { apiError(ctx, http.StatusBadRequest, err) @@ -304,7 +304,7 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference) pref := ctx.Data[packageReferenceKey].(*conan_module.PackageReference) - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") if !fileFilter.Contains(filename) { apiError(ctx, http.StatusBadRequest, nil) return @@ -444,7 +444,7 @@ func DownloadPackageFile(ctx *context.Context) { func downloadFile(ctx *context.Context, fileFilter container.Set[string], fileKey string) { rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference) - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") if !fileFilter.Contains(filename) { apiError(ctx, http.StatusBadRequest, nil) return |