LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move os.IsNotExist call to sendError

This commit is contained in:
Acconut 2015-02-28 14:53:01 +01:00
parent 1659517825
commit 9b3d56bf07
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
handler.go
View File

@ -228,10 +228,6 @@ func (handler *Handler) headFile(w http.ResponseWriter, r *http.Request) {
id := r.URL.Query().Get(":id") id := r.URL.Query().Get(":id")
info, err := handler.dataStore.GetInfo(id) info, err := handler.dataStore.GetInfo(id)
if err != nil { if err != nil {
// Interpret os.ErrNotExist as 404 Not Found
if os.IsNotExist(err) {
err = ErrNotFound
}
handler.sendError(w, err) handler.sendError(w, err)
return return
} }
@ -275,9 +271,6 @@ func (handler *Handler) patchFile(w http.ResponseWriter, r *http.Request) {
info, err := handler.dataStore.GetInfo(id) info, err := handler.dataStore.GetInfo(id)
if err != nil { if err != nil {
if os.IsNotExist(err) {
err = ErrNotFound
}
handler.sendError(w, err) handler.sendError(w, err)
return return
} }
@ -346,9 +339,6 @@ func (handler *Handler) getFile(w http.ResponseWriter, r *http.Request) {
info, err := handler.dataStore.GetInfo(id) info, err := handler.dataStore.GetInfo(id)
if err != nil { if err != nil {
if os.IsNotExist(err) {
err = ErrNotFound
}
handler.sendError(w, err) handler.sendError(w, err)
return return
} }
@ -391,9 +381,6 @@ func (handler *Handler) delFile(w http.ResponseWriter, r *http.Request) {
err := handler.dataStore.Terminate(id) err := handler.dataStore.Terminate(id)
if err != nil { if err != nil {
if os.IsNotExist(err) {
err = ErrNotFound
}
handler.sendError(w, err) handler.sendError(w, err)
return return
} }
@ -404,6 +391,11 @@ func (handler *Handler) delFile(w http.ResponseWriter, r *http.Request) {
// Send the error in the response body. The status code will be looked up in // Send the error in the response body. The status code will be looked up in
// ErrStatusCodes. If none is found 500 Internal Error will be used. // ErrStatusCodes. If none is found 500 Internal Error will be used.
func (handler *Handler) sendError(w http.ResponseWriter, err error) { func (handler *Handler) sendError(w http.ResponseWriter, err error) {
// Interpret os.ErrNotExist as 404 Not Found
if os.IsNotExist(err) {
err = ErrNotFound
}
status, ok := ErrStatusCodes[err] status, ok := ErrStatusCodes[err]
if !ok { if !ok {
status = 500 status = 500