primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 12:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move catalog handler out of download protocol (#1020)

Browse Source 
* Move catalog handler out of download protocol

* Bring back logger

* update comment
This commit is contained in:
Manu Gupta
2019-01-02 21:55:07 -08:00
committed by GitHub
parent 312f1d56a9
commit 3b621caa85
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/download/catalog.go
-59
View File
@@ -1,59 +0,0 @@
package download
import (
"encoding/json"
"net/http"
"strconv"
"github.com/gomods/athens/pkg/errors"
"github.com/gomods/athens/pkg/log"
"github.com/gomods/athens/pkg/paths"
"github.com/gorilla/mux"
)
// PathCatalog URL.
const PathCatalog = "/catalog"
const defaultPageSize = 1000
type catalogRes struct {
ModsAndVersions []paths.AllPathParams `json:"modules"`
NextPageToken string `json:"next"`
}
// CatalogHandler implements GET baseURL/catalog
func CatalogHandler(dp Protocol, lggr log.Entry) http.Handler {
const op errors.Op = "download.CatalogHandler"
f := func(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
token := vars["token"]
pageSize, err := getLimitFromParam(vars["pagesize"])
if err != nil {
lggr.SystemErr(err)
w.WriteHeader(http.StatusInternalServerError)
return
}
modulesAndVersions, newToken, err := dp.Catalog(r.Context(), token, pageSize)
if err != nil {
if errors.Kind(err) != errors.KindNotImplemented {
lggr.SystemErr(errors.E(op, err))
}
w.WriteHeader(errors.Kind(err))
return
}
res := catalogRes{modulesAndVersions, newToken}
if err = json.NewEncoder(w).Encode(res); err != nil {
lggr.SystemErr(errors.E(op, err))
}
}
return http.HandlerFunc(f)
}
func getLimitFromParam(param string) (int, error) {
if param == "" {
return defaultPageSize, nil
}
return strconv.Atoi(param)
}
pkg/download/handler.go
-1
View File
@@ -50,5 +50,4 @@ func RegisterHandlers(r *mux.Router, opts *HandlerOpts) {
r.Handle(PathVersionInfo, LogEntryHandler(InfoHandler, opts)).Methods(http.MethodGet)
r.Handle(PathVersionModule, LogEntryHandler(ModuleHandler, opts)).Methods(http.MethodGet)
r.Handle(PathVersionZip, LogEntryHandler(ZipHandler, opts)).Methods(http.MethodGet)
r.Handle(PathCatalog, LogEntryHandler(CatalogHandler, opts)).Methods(http.MethodGet)
}