adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-18 13:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

now returing bad request if no file to convert

Browse Source
This commit is contained in:
Julien Neuhart
2018-04-11 13:33:12 +02:00
parent a1abbc55a2
commit 35e1894c89
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/converter/converter.go
View File

@@ -19,11 +19,11 @@ type Converter struct {
workingDir string workingDir string
} }
type noFileToConvertError struct{} type NoFileToConvertError struct{}
const noFileToConvertErrorMessage = "No file to convert" const noFileToConvertErrorMessage = "No file to convert"
func (e *noFileToConvertError) Error() string { func (e *NoFileToConvertError) Error() string {
return noFileToConvertErrorMessage return noFileToConvertErrorMessage
} }
@@ -62,7 +62,7 @@ func NewConverter(r *http.Request) (*Converter, error) {
} }
if len(c.files) == 0 { if len(c.files) == 0 {
return c, &noFileToConvertError{} return c, &NoFileToConvertError{}
} }
return c, nil return c, nil

2
app/converter/converter_test.go
View File

@@ -140,7 +140,7 @@ func TestClear(t *testing.T) {
} }
func TestNoFileToConvertError(t *testing.T) { func TestNoFileToConvertError(t *testing.T) {
err := &noFileToConvertError{} err := &NoFileToConvertError{}
if err.Error() != noFileToConvertErrorMessage { if err.Error() != noFileToConvertErrorMessage {
t.Errorf("Error returned a wrong message: got '%s' want '%s'", err.Error(), noFileToConvertErrorMessage) t.Errorf("Error returned a wrong message: got '%s' want '%s'", err.Error(), noFileToConvertErrorMessage)
} }

8
app/handlers.go
View File

@@ -60,8 +60,12 @@ func convertHandler(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := converter.NewConverter(r) c, err := converter.NewConverter(r)
if err != nil { if err != nil {
// TODO bad request if no file to convert if _, ok := err.(*converter.NoFileToConvertError); ok {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusBadRequest)
} else {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
logger.Error(err) logger.Error(err)
if c != nil { if c != nil {