Merge lp:~chipaca/snapweb/json-responses into lp:~snappy-dev/snapweb/trunk

[John Lenton]

Make all responses application/json.

Stephen, asking for a review from you mostly because AIUI this'll break some things on your end (although the tests pass).

[Sergio Schvezov (sergiusens)]

the json responses was something we were supposed to do anyways (to not break the ui fw), so kudos for that!

One comment and one question

review: Approve

[lp:~chipaca/snapweb/json-responses]

114. By John Lenton on 2015-05-06

removed commented-out line

115. By John Lenton on 2015-05-06

report errors out

116. By John Lenton on 2015-05-06

merged trunk

[Sergio Schvezov (sergiusens)]

review: Approve

[lp:~chipaca/snapweb/json-responses]

117. By John Lenton on 2015-05-06

Merged vendor-and-description into json-responses.

=== modified file 'README.md'
--- README.md	2015-04-29 15:01:08 +0000
+++ README.md	2015-05-06 15:03:42 +0000
@@ -9,15 +9,16 @@
 
 Install global npm modules without sudo:
 
-    cat > ~/.npmrc << EOF
-    root = $HOME/node/lib/node_modules
-    prefix = $HOME/node
-    binroot = $HOME/node/bin
-    manroot = $HOME/node/man
-    EOF
+    cat > ~/.npmrc <<-EOF
+	root = $HOME/node/lib/node_modules
+	prefix = $HOME/node
+	binroot = $HOME/node/bin
+	manroot = $HOME/node/man
+	EOF
 
 Setup the environment:
 
+    mkdir ~/node
     export PATH=$PATH:$HOME/node/bin
     export NODE_PATH=$HOME/node/lib/node_modules
 

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-06 12:49:52 +0000
+++ snappy/converge.go	2015-05-06 15:03:42 +0000
@@ -37,6 +37,7 @@
 	Icon          string          `json:"icon"`
 	Status        string          `json:"status"`
 	Message       string          `json:"message,omitempty"`
+	IsError       bool            `json:"-"`
 	Progress      float64         `json:"progress,omitempty"`
 	InstalledSize int64           `json:"installed_size,omitempty"`
 	DownloadSize  int64           `json:"download_size,omitempty"`
@@ -113,6 +114,7 @@
 func (h *Handler) doInstallPackage(progress *webprogress.WebProgress, pkgName string) {
 	_, err := snappy.Install(pkgName, 0, progress)
 	progress.ErrorChan <- err
+	close(progress.ErrorChan)
 }
 
 func (h *Handler) installPackage(pkgName string) error {
@@ -202,6 +204,7 @@
 
 			if stat.Error != nil {
 				snap.Message = stat.Error.Error()
+				snap.IsError = true
 			}
 
 		} else {

=== modified file 'snappy/handlers.go'
--- snappy/handlers.go	2015-05-03 20:35:34 +0000
+++ snappy/handlers.go	2015-05-06 15:03:42 +0000
@@ -21,10 +21,9 @@
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 
-	"log"
-
 	"launchpad.net/snappy/snappy"
 	"launchpad.net/webdm/webprogress"
 
@@ -44,80 +43,99 @@
 }
 
 func (h *Handler) getAll(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	enc := json.NewEncoder(w)
 	dec := json.NewDecoder(r.Body)
 
 	var filter listFilter
 	if err := dec.Decode(&filter); err != nil && err != io.EOF {
 		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprint(w, fmt.Sprintf("Error: %s", err))
+		enc.Encode(fmt.Sprintf("Error: %s", err))
 		return
 	}
 
 	payload, err := h.allPackages(filter.InstalledOnly)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprint(w, fmt.Sprintf("Error: %s", err))
+		enc.Encode(fmt.Sprintf("Error: %s", err))
 		return
 	}
 
-	enc := json.NewEncoder(w)
 	if err := enc.Encode(payload); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprint(w, fmt.Sprintf("Error: %s", err))
-		return
+		// give up on json
+		fmt.Fprintf(w, "Error: %s", err)
+		log.Print(err)
 	}
 }
 
 func (h *Handler) get(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
 	// Get the Key.
 	vars := mux.Vars(r)
 	pkgName := vars["pkg"]
+	enc := json.NewEncoder(w)
 
 	payload, err := h.packagePayload(pkgName)
 	if err != nil {
-		http.NotFound(w, r)
-		fmt.Fprintln(w, err, pkgName)
+		w.WriteHeader(http.StatusNotFound)
+		enc.Encode(fmt.Sprintln(err, pkgName))
 		return
 	}
 
-	enc := json.NewEncoder(w)
+	if payload.IsError {
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+
 	if err := enc.Encode(payload); err != nil {
-		fmt.Fprint(w, "Error")
+		w.WriteHeader(http.StatusInternalServerError)
+		// give up on json
+		fmt.Fprintf(w, "Error: %s", err)
+		log.Print(err)
 	}
 }
 
 func (h *Handler) add(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
 	// Get the Key.
 	vars := mux.Vars(r)
 	pkgName := vars["pkg"]
 
-	enc := json.NewEncoder(w)
 	var msg string
+	var status int
 
 	err := h.installPackage(pkgName)
 
 	switch err {
 	case snappy.ErrAlreadyInstalled:
-		w.WriteHeader(http.StatusOK)
+		status = http.StatusOK
 		msg = "Installed"
 	case webprogress.ErrPackageInstallInProgress:
-		w.WriteHeader(http.StatusBadRequest)
+		status = http.StatusBadRequest
 		msg = "Installation in progress"
 	case snappy.ErrPackageNotFound:
-		w.WriteHeader(http.StatusNotFound)
+		status = http.StatusNotFound
 		msg = "Package not found"
 	case nil:
-		w.WriteHeader(http.StatusAccepted)
+		status = http.StatusAccepted
 		msg = "Accepted"
 	default:
-		w.WriteHeader(http.StatusInternalServerError)
+		status = http.StatusInternalServerError
 		msg = "Processing error"
 	}
 
 	response := response{Message: msg, Package: pkgName}
-	if err := enc.Encode(response); err != nil {
+	bs, err := json.Marshal(response)
+	if err != nil {
+		// giving up on json
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprintf(w, "Error: %s", err)
 		log.Print(err)
+		return
 	}
+
+	w.WriteHeader(status)
+	w.Write(bs)
 }
 
 // MakeMuxer sets up the handlers multiplexing to handle requests against snappy's

=== modified file 'webprogress/meter.go'
--- webprogress/meter.go	2015-05-03 20:46:10 +0000
+++ webprogress/meter.go	2015-05-06 15:03:42 +0000
@@ -48,7 +48,6 @@
 	}
 
 	go func() {
-		defer close(t.ErrorChan)
 		err := <-t.ErrorChan
 
 		if err != nil {