Fix duplicated 'depends' field check

Author: cmaglie

src/arduino.cc/repository/libraries/db/dependencies_test.go

@@ -8,16 +8,19 @@ import (
 
 func TestDependencyExtract(t *testing.T) {
 	check := func(depDefinition string, name []string, ver []string) {
-		dep := extractDependenciesList(depDefinition)
+		dep, err := ExtractDependenciesList(depDefinition)
+		require.NoError(t, err)
 		require.NotNil(t, dep)
 		require.Len(t, dep, len(name))
 		for i := range name {
 			require.Equal(t, name[i], dep[i].Name)
 			require.Equal(t, ver[i], dep[i].Version)
 		}
 	}
-	invalid := func(dep string) {
-		require.Nil(t, extractDependenciesList(dep))
+	invalid := func(depends string) {
+		dep, err := ExtractDependenciesList(depends)
+		require.Nil(t, dep)
+		require.Error(t, err)
 	}
 	invalid("-invalidname")
 	invalid("_invalidname")

src/arduino.cc/repository/libraries/db/library.go

@@ -11,6 +11,7 @@ import (
 // FromLibraryToRelease extract a Release from LibraryMetadata. LibraryMetadata must be
 // validated before running this function.
 func FromLibraryToRelease(library *metadata.LibraryMetadata) *Release {
+	deps, _ := ExtractDependenciesList(library.Depends)
 	dbRelease := Release{
 		LibraryName:   library.Name,
 		Version:       VersionFromString(library.Version),
@@ -24,7 +25,7 @@ func FromLibraryToRelease(library *metadata.LibraryMetadata) *Release {
 		Architectures: extractStringList(library.Architectures),
 		Types:         library.Types,
 		Includes:      extractStringList(library.Includes),
-		Dependencies:  extractDependenciesList(library.Depends),
+		Dependencies:  deps,
 	}
 
 	return &dbRelease
@@ -44,7 +45,8 @@ func extractStringList(value string) []string {
 
 var re = regexp.MustCompile("^([a-zA-Z0-9](?:[a-zA-Z0-9._\\- ]*[a-zA-Z0-9])?) *(?: \\(([^()]*)\\))?$")
 
-func extractDependenciesList(depends string) []*Dependency {
+// ExtractDependenciesList extracts dependencies from the "depends" field of library.properties
+func ExtractDependenciesList(depends string) ([]*Dependency, error) {
 	deps := []*Dependency{}
 	for _, dep := range strings.Split(depends, ",") {
 		dep = strings.TrimSpace(dep)
@@ -53,13 +55,12 @@ func extractDependenciesList(depends string) []*Dependency {
 		}
 		matches := re.FindAllStringSubmatch(dep, -1)
 		if matches == nil {
-			fmt.Println("invalid dep:", dep)
-			return nil
+			return nil, fmt.Errorf("invalid dep: %s", dep)
 		}
 		deps = append(deps, &Dependency{
 			Name:    matches[0][1],
 			Version: matches[0][2],
 		})
 	}
-	return deps
+	return deps, nil
 }

src/arduino.cc/repository/libraries/metadata/metadata.go

@@ -19,6 +19,8 @@ import (
 	"errors"
 	"strings"
 
+	"arduino.cc/repository/libraries/db"
+
 	"github.com/google/go-github/github"
 	ini "github.com/vaughan0/go-ini"
 )
@@ -123,17 +125,8 @@ func IsValidLibraryName(name string) bool {
 
 // IsValidDependency checks if the `depends` field of library.properties is correctly formatted
 func IsValidDependency(depends string) bool {
-	deps := strings.Split(depends, ",")
-	if len(deps) == 1 && deps[0] == "" {
-		return true
-	}
-	for _, dep := range deps {
-		dep = strings.TrimSpace(dep)
-		if !IsValidLibraryName(dep) {
-			return false
-		}
-	}
-	return true
+	_, err := db.ExtractDependenciesList(depends)
+	return err == nil
 }
 
 // ParsePullRequest makes a LibraryMetadata by reading library.properties from a github.PullRequest