Merge pull request #1 from calmh/master

Support searches among multiple archs

packages.go

@@ -56,7 +56,7 @@ func (p Packages) FilterByArch(query string) Packages {
 	output := Packages{}
 
 	for _, synoPkg := range p {
-		if synoPkg.Arch == query || synoPkg.familyOrArchMatch(query) || synoPkg.Arch == "noarch" {
+		if synoPkg.Arch == query || sliceOfStringsContains(strings.Fields(synoPkg.Arch), query) || synoPkg.familyOrArchMatch(query) || synoPkg.Arch == "noarch" {
 			output = append(output, synoPkg)
 		}
 	}

packages_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 	"testing"
 
 	syno "jdel.org/go-syno"
@@ -16,6 +17,7 @@ var pX8664,
 	pCedarview3,
 	pX86,
 	pEvansport,
+	pMulti,
 	p1,
 	p2 *syno.Package
 
@@ -56,6 +58,12 @@ func init() {
 		Arch:        "cedarview",
 		Version:     "1.1",
 	}
+	pMulti = &syno.Package{
+		Name:        "multi-arch-package",
+		DisplayName: "Multi Arch Package",
+		Arch:        "x86_64 apollolake broadwell",
+		Version:     "1.1",
+	}
 	pX86 = &syno.Package{
 		Name: "x86-package",
 		Arch: "x86",
@@ -219,6 +227,17 @@ func TestFilterByArch(t *testing.T) {
 	}
 }
 
+func TestFilterByArchMulti(t *testing.T) {
+	pp := syno.Packages{pMulti}
+	archs := strings.Fields(pMulti.Arch)
+	for _, arch := range archs {
+		ppf := pp.FilterByArch(arch)
+		if len(ppf) != 1 {
+			t.Errorf("Expected 1 package to match %q but got %+v", arch, ppf)
+		}
+	}
+}
+
 func TestFilterByFirmware(t *testing.T) {
 	pp := syno.Packages{p1, p2}
 	ppf := pp.FilterByFirmware("6.1")