Merge lp:~chipaca/snapweb/filter-by-type into lp:~snappy-dev/snapweb/trunk

[John Lenton]

allPackages now filters by type.

[Sergio Schvezov (sergiusens)]

Hey, this looks good, but it won't work entirely, can you look at my inline comment?

review: Needs Fixing

[lp:~chipaca/snapweb/filter-by-type]

120. By John Lenton on 2015-05-06

don't look into non-aliased packages for now

[Sergio Schvezov (sergiusens)]

curl -X GET -d '{"types": ["oem"] }' http://localhost:4200/api/v2/packages/| python -m json.tool

returns a bigger list that just type oem, can you double check please?

Thanks for working on this, and I know this part is a consistency mess withing snappy.

review: Needs Fixing

[lp:~chipaca/snapweb/filter-by-type]

121. By John Lenton on 2015-05-07

Merged json-responses into filter-by-type.

122. By John Lenton on 2015-05-07

 Merged json-responses into filter-by-type.

[Sergio Schvezov (sergiusens)]

works like a charm!

review: Approve

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-07 15:37:20 +0000
+++ snappy/converge.go	2015-05-07 16:33:54 +0000
@@ -18,6 +18,7 @@
 package snappy
 
 import (
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -86,7 +87,7 @@
 	return snapPkg{}, snappy.ErrPackageNotFound
 }
 
-func (h *Handler) allPackages(installedOnly bool) ([]snapPkg, error) {
+func (h *Handler) allPackages(filter *listFilter) ([]snapPkg, error) {
 	mLocal := snappy.NewMetaLocalRepository()
 
 	installedSnaps, err := mLocal.Installed()
@@ -94,8 +95,21 @@
 		return nil, err
 	}
 
+	typeFilter := func(string) bool { return true }
+
+	if len(filter.Types) != 0 {
+		regex, err := regexp.Compile("^(?:" + strings.Join(filter.Types, "|") + ")")
+		if err != nil {
+			return nil, err
+		}
+		typeFilter = regex.MatchString
+	}
+
 	installedSnapQs := make([]snapPkg, 0, len(installedSnaps))
 	for i := range installedSnaps {
+		if !typeFilter(string(installedSnaps[i].Type())) {
+			continue
+		}
 		installedSnapQs = append(installedSnapQs, h.snapQueryToPayload(installedSnaps[i]))
 	}
 
@@ -109,15 +123,21 @@
 
 	for _, remote := range remoteSnaps {
 		if alias := remote.Alias; alias != nil {
+			if !typeFilter(string(alias.Type())) {
+				continue
+			}
 			remoteSnapQs = append(remoteSnapQs, h.snapQueryToPayload(alias))
 		} else {
 			for _, part := range remote.Parts {
+				if !typeFilter(string(part.Type())) {
+					continue
+				}
 				remoteSnapQs = append(remoteSnapQs, h.snapQueryToPayload(part))
 			}
 		}
 	}
 
-	return mergeSnaps(installedSnapQs, remoteSnapQs, 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-06 23:40:58 +0000
+++ snappy/handlers.go	2015-05-07 16:33:54 +0000
@@ -67,7 +67,7 @@
 		return
 	}
 
-	payload, err := h.allPackages(filter.InstalledOnly)
+	payload, err := h.allPackages(&filter)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		enc.Encode(fmt.Sprintf("Error: %s", err))