Simplified utils.Match function

Author: cmaglie

Diff for: arduino/utils/search.go

@@ -47,20 +47,20 @@ func removeDiatrics(s string) (string, error) {
 // Both str and substrings are transforms to lower case and have their
 // accents and other unicode diatrics removed.
 // If strings transformation fails an error is returned.
-func Match(str string, substrings []string) (bool, error) {
-	str, err := removeDiatrics(strings.ToLower(str))
-	if err != nil {
-		return false, err
+func Match(str string, substrings []string) bool {
+	clean := func(s string) string {
+		s = strings.ToLower(s)
+		if s2, err := removeDiatrics(s); err == nil {
+			return s2
+		}
+		return s
 	}
 
+	str = clean(str)
 	for _, sub := range substrings {
-		cleanSub, err := removeDiatrics(strings.ToLower(sub))
-		if err != nil {
-			return false, err
-		}
-		if !strings.Contains(str, cleanSub) {
-			return false, nil
+		if !strings.Contains(str, clean(sub)) {
+			return false
 		}
 	}
-	return true, nil
+	return true
 }

Diff for: commands/board/listall.go

@@ -47,12 +47,8 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListA
 		}
 
 		for _, t := range toTest {
-			matches, err := utils.Match(t, searchArgs)
-			if err != nil {
-				return false, err
-			}
-			if matches {
-				return matches, nil
+			if utils.Match(t, searchArgs) {
+				return true, nil
 			}
 		}
 		return false, nil

Diff for: commands/board/search.go

@@ -44,12 +44,8 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 		}
 
 		for _, t := range toTest {
-			matches, err := utils.Match(t, searchArgs)
-			if err != nil {
-				return false, err
-			}
-			if matches {
-				return matches, nil
+			if utils.Match(t, searchArgs) {
+				return true, nil
 			}
 		}
 		return false, nil

Diff for: commands/core/search.go

@@ -54,12 +54,8 @@ func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse
 			}
 
 			for _, t := range toTest {
-				matches, err := utils.Match(t, searchArgs)
-				if err != nil {
-					return false, err
-				}
-				if matches {
-					return matches, nil
+				if utils.Match(t, searchArgs) {
+					return true, nil
 				}
 			}
 			return false, nil

Diff for: commands/lib/search.go

@@ -51,12 +51,8 @@ func searchLibrary(req *rpc.LibrarySearchRequest, lm *librariesmanager.Libraries
 		}
 
 		for _, t := range toTest {
-			matches, err := utils.Match(t, searchArgs)
-			if err != nil {
-				return false, err
-			}
-			if matches {
-				return matches, nil
+			if utils.Match(t, searchArgs) {
+				return true, nil
 			}
 		}
 		return false, nil