diff options
| author | clsr <clsr@clsr.net> | 2016-06-17 18:32:03 +0200 |
|---|---|---|
| committer | clsr <clsr@clsr.net> | 2016-06-17 18:32:03 +0200 |
| commit | 0e90a2ae71828dabfb309bda478b5fc509e1cbe0 (patch) | |
| tree | 3a23a719ba67d53880e92bdfbf7653530ad0ab62 | |
| parent | 5a57899bb23302c0fc764f75306e09370803aee6 (diff) | |
| download | gomf-0e90a2ae71828dabfb309bda478b5fc509e1cbe0.tar.gz gomf-0e90a2ae71828dabfb309bda478b5fc509e1cbe0.zip | |
Fix error response in csv, text and gyazo output modesv0.2.1
| -rw-r--r-- | api.go | 23 |
1 files changed, 16 insertions, 7 deletions
@@ -138,10 +138,14 @@ func respond(w http.ResponseWriter, mode string, resp response) { case "text", "gyazo": w.Header().Set("Content-Type", "text/plain") - sep := "" - for _, file := range resp.Files { - io.WriteString(w, sep+file.Url) - sep = "\n" + if resp.ErrorCode == 0 { + sep := "" + for _, file := range resp.Files { + io.WriteString(w, sep+file.Url) + sep = "\n" + } + } else { + io.WriteString(w, "ERROR: ("+strconv.Itoa(resp.ErrorCode)+") "+resp.Description) } if mode != "gyazo" { io.WriteString(w, "\n") @@ -150,9 +154,14 @@ func respond(w http.ResponseWriter, mode string, resp response) { case "csv": w.Header().Set("Content-Type", "text/csv") wr := csv.NewWriter(w) - wr.Write([]string{"name", "url", "hash", "size"}) - for _, file := range resp.Files { - wr.Write([]string{file.Name, file.Url, file.Hash, strconv.FormatInt(file.Size, 10)}) + if resp.ErrorCode == 0 { + wr.Write([]string{"name", "url", "hash", "size"}) + for _, file := range resp.Files { + wr.Write([]string{file.Name, file.Url, file.Hash, strconv.FormatInt(file.Size, 10)}) + } + } else { + wr.Write([]string{"error"}) + wr.Write([]string{resp.Description}) } wr.Flush() |