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

[Sergio Schvezov]

Adding support for package name queries (with some polish along the way).

[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.

[Stephen Stewart (stephen-stewart)]

I see the same results no matter what the query. Have I got the format correct?

http://webdm.local:4200/api/v2/packages/?q=8nzc1x4iim2xj1g2ul64

[Sergio Schvezov (sergiusens)]

Querying for 8nzc1x4iim2xj1g2ul64 as in http://webdm.local:4200/api/v2/packages/?q=8nzc1x4iim2xj1g2ul64 is not the best test subject.

10:18 < nessita> sergiusens, try this https://search.apps.ubuntu.com/api/v1/search?q=%228nzc1x4iim2xj1g2ul64%22
10:18 < nessita> ie, with double quotes, I'll explain why
10:21 < nessita> sergiusens, our package index performs analysis for both the data being indexed, and the search term. The
                 analysis, among other things, try to parse the given string to take out the most relevant part and also search for
                 derivates
10:23 < nessita> sergiusens, using quotes all the time is a bad idea, quotes mean exact match
10:24 < sergiusens> nessita: right, so then beowulf using the strange package name for searching is a bad idea
10:24 < sergiusens> for testing it at least
10:24 < sergiusens> as in eyeball testing
10:25 < nessita> sergiusens, indeed. Ideally, a user will search for keywords, such as "news" and we want to include results for
                 "newspaper" for example

[Stephen Stewart (stephen-stewart)]

\o/

review: Approve

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-07 16:29:23 +0000
+++ snappy/converge.go	2015-05-08 15:22:57 +0000
@@ -54,8 +54,9 @@
 }
 
 type listFilter struct {
-	Types         []string
-	InstalledOnly bool
+	types         []string
+	installedOnly bool
+	query         string
 }
 
 // for easier stubbing during testing
@@ -97,24 +98,39 @@
 
 	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]))
 	}
 
 	mStore := snappy.NewUbuntuStoreSnapRepository()
-	remoteSnaps, err := mStore.Search("*")
+	remoteSnaps, err := mStore.Search(filter.query)
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +153,7 @@
 		}
 	}
 
-	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 15:22:57 +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)