Merge lp:~sergiusens/snapweb/filterInstalled into lp:~snappy-dev/snapweb/trunk

[Sergio Schvezov]

Proper way to parametrize queries with gets

[John Lenton (chipaca)]

review: Approve

[Stephen Stewart (stephen-stewart)]

wfm

review: Approve

[lp:~sergiusens/snapweb/filterInstalled]

128. By Sergio Schvezov on 2015-05-07

Merged originNamespacesInconsistencies into filterInstalled.

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-07 15:42:24 +0000
+++ snappy/converge.go	2015-05-07 15:42:24 +0000
@@ -53,8 +53,8 @@
 }
 
 type listFilter struct {
-	Types         []string `json:"types,omitempty"`
-	InstalledOnly bool     `json:"installed_only"`
+	Types         []string
+	InstalledOnly bool
 }
 
 // for easier stubbing during testing

=== modified file 'snappy/handlers.go'
--- snappy/handlers.go	2015-05-07 15:42:24 +0000
+++ snappy/handlers.go	2015-05-07 15:42:24 +0000
@@ -23,6 +23,7 @@
 	"io"
 	"log"
 	"net/http"
+	"strings"
 
 	"launchpad.net/snappy/snappy"
 	"launchpad.net/webdm/webprogress"
@@ -42,12 +43,24 @@
 	}
 }
 
+func installedOnly(v string) bool {
+	return v == "true"
+}
+
+func types(v string) []string {
+	return strings.Split(v, ",")
+}
+
 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
+	filter := listFilter{
+		InstalledOnly: installedOnly(r.FormValue("installed_only")),
+		Types:         types(r.FormValue("types")),
+	}
+
 	if err := dec.Decode(&filter); err != nil && err != io.EOF {
 		w.WriteHeader(http.StatusInternalServerError)
 		enc.Encode(fmt.Sprintf("Error: %s", err))