From bb02782dfb41a0c0ab4dd39ce4564dcbf358be40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Delattre?= Date: Mon, 9 Jan 2017 14:23:54 +0100 Subject: [PATCH] Return more detailed errors in HTTP handlers --- src/internal/external_medias/handlers.go | 11 ++++++----- src/internal/movies/handlers.go | 4 ++-- src/internal/shows/handlers.go | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/internal/external_medias/handlers.go b/src/internal/external_medias/handlers.go index 488c354..6ad4674 100644 --- a/src/internal/external_medias/handlers.go +++ b/src/internal/external_medias/handlers.go @@ -2,6 +2,7 @@ package extmedias import ( "database/sql" + "errors" "fmt" "net/http" @@ -176,13 +177,13 @@ func Explore(env *web.Env, w http.ResponseWriter, r *http.Request) error { v := auth.GetCurrentUser(r, env.Log) user, ok := v.(*users.User) if !ok { - return fmt.Errorf("invalid user type") + return env.RenderError(w, errors.New("invalid user")) } // Get the medias without trying to refresh them movies, err := GetMovies(env, user, source, category, false) if err != nil { - return err + return env.RenderError(w, err) } return env.RenderJSON(w, movies) @@ -210,7 +211,7 @@ func ExploreShows(env *web.Env, w http.ResponseWriter, r *http.Request) error { // Get the medias without trying to refresh them shows, err := GetShows(env, source, category, false) if err != nil { - return err + return env.RenderError(w, err) } return env.RenderJSON(w, shows) @@ -252,7 +253,7 @@ func Refresh(env *web.Env, w http.ResponseWriter, r *http.Request) error { // GetMedias and refresh them _, err := GetMovies(env, user, source, category, true) if err != nil { - return err + return env.RenderError(w, err) } } @@ -278,7 +279,7 @@ func RefreshShows(env *web.Env, w http.ResponseWriter, r *http.Request) error { // GetMedias and refresh them _, err := GetShows(env, source, category, true) if err != nil { - return err + return env.RenderError(w, err) } } diff --git a/src/internal/movies/handlers.go b/src/internal/movies/handlers.go index 6d13419..9416a4c 100644 --- a/src/internal/movies/handlers.go +++ b/src/internal/movies/handlers.go @@ -134,7 +134,7 @@ func SearchMovie(env *web.Env, w http.ResponseWriter, r *http.Request) error { } err := json.NewDecoder(r.Body).Decode(&data) if err != nil { - return err + return env.RenderError(w, errors.New("failed to get the search key")) } if data.Key == "" { @@ -144,7 +144,7 @@ func SearchMovie(env *web.Env, w http.ResponseWriter, r *http.Request) error { v := auth.GetCurrentUser(r, env.Log) user, ok := v.(*users.User) if !ok { - return fmt.Errorf("invalid user type") + return env.RenderError(w, errors.New("invalid user")) } var movies []*polochon.Movie diff --git a/src/internal/shows/handlers.go b/src/internal/shows/handlers.go index 9453eec..29d17b8 100644 --- a/src/internal/shows/handlers.go +++ b/src/internal/shows/handlers.go @@ -32,7 +32,7 @@ func SearchShow(env *web.Env, w http.ResponseWriter, r *http.Request) error { Key string `json:"key"` } if err := json.NewDecoder(r.Body).Decode(&data); err != nil { - return err + return env.RenderError(w, errors.New("failed to get the search key")) } if data.Key == "" {