Factored out all duplicated match helpers

Author: cmaglie

Diff for: arduino/utils/search.go

@@ -64,3 +64,18 @@ func Match(str string, substrings []string) bool {
 	}
 	return true
 }
+
+// MatchAny checks if query matches at least one of the
+// string in arrayToMatch using the utils.Match function.
+func MatchAny(query string, arrayToMatch []string) bool {
+	queryArgs := strings.Split(strings.TrimSpace(query), " ")
+	if len(queryArgs) == 0 {
+		return true
+	}
+	for _, t := range arrayToMatch {
+		if Match(t, queryArgs) {
+			return true
+		}
+	}
+	return false
+}

Diff for: commands/board/listall.go

@@ -32,23 +32,7 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListA
 		return nil, errors.New(tr("invalid instance"))
 	}
 
-	searchArgs := []string{}
-	for _, s := range req.SearchArgs {
-		searchArgs = append(searchArgs, strings.Trim(s, " "))
-	}
-
-	match := func(toTest []string) bool {
-		if len(searchArgs) == 0 {
-			return true
-		}
-
-		for _, t := range toTest {
-			if utils.Match(t, searchArgs) {
-				return true
-			}
-		}
-		return false
-	}
+	searchArgs := strings.Join(req.GetSearchArgs(), " ")
 
 	list := &rpc.BoardListAllResponse{Boards: []*rpc.BoardListItem{}}
 	for _, targetPackage := range pm.Packages {
@@ -92,7 +76,7 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListA
 
 				toTest := append(toTest, board.Name())
 				toTest = append(toTest, board.FQBN())
-				if !match(toTest) {
+				if !utils.MatchAny(searchArgs, toTest) {
 					continue
 				}
 

Diff for: commands/board/search.go

@@ -36,21 +36,6 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 		return nil, errors.New(tr("invalid instance"))
 	}
 
-	searchArgs := strings.Split(strings.Trim(req.SearchArgs, " "), " ")
-
-	match := func(toTest []string) bool {
-		if len(searchArgs) == 0 {
-			return true
-		}
-
-		for _, t := range toTest {
-			if utils.Match(t, searchArgs) {
-				return true
-			}
-		}
-		return false
-	}
-
 	res := &rpc.BoardSearchResponse{Boards: []*rpc.BoardListItem{}}
 	for _, targetPackage := range pm.Packages {
 		for _, platform := range targetPackage.Platforms {
@@ -89,7 +74,7 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 					}
 
 					toTest := append(strings.Split(board.Name(), " "), board.Name(), board.FQBN())
-					if !match(toTest) {
+					if !utils.MatchAny(req.GetSearchArgs(), toTest) {
 						continue
 					}
 
@@ -103,7 +88,7 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 			} else if latestPlatformRelease != nil {
 				for _, board := range latestPlatformRelease.BoardsManifest {
 					toTest := append(strings.Split(board.Name, " "), board.Name)
-					if !match(toTest) {
+					if !utils.MatchAny(req.GetSearchArgs(), toTest) {
 						continue
 					}
 

Diff for: commands/core/search.go

@@ -33,7 +33,7 @@ const maximumSearchDistance = 20
 
 // PlatformSearch FIXMEDOC
 func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse, error) {
-	searchArgs := strings.Trim(req.SearchArgs, " ")
+	searchArgs := strings.TrimSpace(req.SearchArgs)
 	allVersions := req.AllVersions
 	pm := commands.GetPackageManager(req.Instance.Id)
 	if pm == nil {
@@ -46,21 +46,6 @@ func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse
 		res = pm.FindPlatformReleaseProvidingBoardsWithVidPid(vid, pid)
 	} else {
 
-		searchArgs := strings.Split(searchArgs, " ")
-
-		match := func(toTest []string) bool {
-			if len(searchArgs) == 0 {
-				return true
-			}
-
-			for _, t := range toTest {
-				if utils.Match(t, searchArgs) {
-					return true
-				}
-			}
-			return false
-		}
-
 		for _, targetPackage := range pm.Packages {
 			for _, platform := range targetPackage.Platforms {
 				// discard invalid platforms
@@ -91,7 +76,7 @@ func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse
 				}
 
 				// Search
-				if !match(toTest) {
+				if !utils.MatchAny(searchArgs, toTest) {
 					continue
 				}
 

Diff for: commands/lib/search.go

@@ -18,7 +18,6 @@ package lib
 import (
 	"context"
 	"errors"
-	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
@@ -39,28 +38,12 @@ func LibrarySearch(ctx context.Context, req *rpc.LibrarySearchRequest) (*rpc.Lib
 }
 
 func searchLibrary(req *rpc.LibrarySearchRequest, lm *librariesmanager.LibrariesManager) (*rpc.LibrarySearchResponse, error) {
-	query := req.GetQuery()
 	res := []*rpc.SearchedLibrary{}
 	status := rpc.LibrarySearchStatus_LIBRARY_SEARCH_STATUS_SUCCESS
 
-	searchArgs := strings.Split(strings.Trim(query, " "), " ")
-
-	match := func(toTest []string) bool {
-		if len(searchArgs) == 0 {
-			return true
-		}
-
-		for _, t := range toTest {
-			if utils.Match(t, searchArgs) {
-				return true
-			}
-		}
-		return false
-	}
-
 	for _, lib := range lm.Index.Libraries {
 		toTest := []string{lib.Name, lib.Latest.Paragraph, lib.Latest.Sentence}
-		if !match(toTest) {
+		if !utils.MatchAny(req.GetQuery(), toTest) {
 			continue
 		}
 		res = append(res, indexLibraryToRPCSearchLibrary(lib))