Merge lp:~sergiusens/snapweb/queryPackageNames into lp:~stephen-stewart/snapweb/disabled-install-buttons-for-oem-types

[Sergio Schvezov]

Add support to query package names (with polish).

[lp:~sergiusens/snapweb/queryPackageNames]

139. By Sergio Schvezov on 2015-05-08

Don't do useless operations when we have the availability of someone else doing it for us.

Unmerged revisions

139. By Sergio Schvezov on 2015-05-08

Don't do useless operations when we have the availability of someone else doing it for us.

138. By Sergio Schvezov on 2015-05-08

Adding package query support

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-07 16:29:23 +0000
+++ snappy/converge.go	2015-05-08 14:57:49 +0000
@@ -54,8 +54,9 @@
 }
 
 type listFilter struct {
-	Types         []string
-	InstalledOnly bool
+	types         []string
+	installedOnly bool
+	query         string
 }
 
 // for easier stubbing during testing
@@ -97,19 +98,34 @@
 
 	typeFilter := func(string) bool { return true }
 
-	if len(filter.Types) != 0 {
-		regex, err := regexp.Compile("^(?:" + strings.Join(filter.Types, "|") + ")")
+	if len(filter.types) != 0 {
+		regex, err := regexp.Compile("^(?:" + strings.Join(filter.types, "|") + ")")
 		if err != nil {
 			return nil, err
 		}
 		typeFilter = regex.MatchString
 	}
 
+	queryFilter := func(string) bool { return true }
+
+	if filter.query != "" {
+		regex, err := regexp.Compile("^(?:" + filter.query + ")")
+		if err != nil {
+			return nil, err
+		}
+		queryFilter = regex.MatchString
+	}
+
 	installedSnapQs := make([]snapPkg, 0, len(installedSnaps))
 	for i := range installedSnaps {
 		if !typeFilter(string(installedSnaps[i].Type())) {
 			continue
 		}
+
+		if !queryFilter(installedSnaps[i].Name()) {
+			continue
+		}
+
 		installedSnapQs = append(installedSnapQs, h.snapQueryToPayload(installedSnaps[i]))
 	}
 
@@ -126,18 +142,24 @@
 			if !typeFilter(string(alias.Type())) {
 				continue
 			}
+			if !queryFilter(alias.Name()) {
+				continue
+			}
 			remoteSnapQs = append(remoteSnapQs, h.snapQueryToPayload(alias))
 		} else {
 			for _, part := range remote.Parts {
 				if !typeFilter(string(part.Type())) {
 					continue
 				}
+				if !queryFilter(part.Name()) {
+					continue
+				}
 				remoteSnapQs = append(remoteSnapQs, h.snapQueryToPayload(part))
 			}
 		}
 	}
 
-	return mergeSnaps(installedSnapQs, remoteSnapQs, filter.InstalledOnly), nil
+	return mergeSnaps(installedSnapQs, remoteSnapQs, filter.installedOnly), nil
 }
 
 func (h *Handler) doRemovePackage(progress *webprogress.WebProgress, ID string) {
 
=== modified file 'snappy/handlers.go'
--- snappy/handlers.go	2015-05-07 16:29:23 +0000
+++ snappy/handlers.go	2015-05-08 14:57:49 +0000
@@ -20,7 +20,6 @@
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"strings"
@@ -54,17 +53,11 @@
 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)
 
 	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))
-		return
+		installedOnly: installedOnly(r.FormValue("installed_only")),
+		types:         types(r.FormValue("types")),
+		query:         r.FormValue("q"),
 	}
 
 	payload, err := h.allPackages(&filter)