Use specified package_index name to filter results

Author: facchinm

add_missing_build_properties_from_parent_platform_txt_files.go

@@ -30,6 +30,8 @@
 package builder
 
 import (
+	"strings"
+
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/json_package_index"
 	"github.com/arduino/arduino-builder/types"
@@ -57,7 +59,8 @@ func (s *OverridePropertiesWithJsonInfo) Run(ctx *types.Context) error {
 
 	if ctx.JsonFolders != nil {
 
-		jsonProperties, err := json_package_index.PackageIndexFoldersToPropertiesMap(ctx.Hardware, ctx.JsonFolders)
+		allowedJsons := strings.Split(ctx.BuildProperties[constants.ADDITIONALE_BOARD_MANAGER_JSON], ",")
+		jsonProperties, err := json_package_index.PackageIndexFoldersToPropertiesMap(ctx.Hardware, ctx.JsonFolders, allowedJsons)
 
 		if err != nil {
 			// doesn't matter, log the broken package in verbose mode

constants/constants.go

@@ -232,5 +232,6 @@ const SKETCH_FOLDER_SRC = "src"
 const TOOL_NAME = "name"
 const TOOL_URL = "url"
 const TOOL_VERSION = "version"
+const ADDITIONALE_BOARD_MANAGER_JSON = "boardsmanager.additional.urls"
 const HACK_PROPERTIES_AVR_GCC_NEW = BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX + "avr-gcc-arduino-4.9.2-atmel3.5.3-arduino2" + BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX
 const HACK_PROPERTIES_AVR_GCC_OLD = BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX + "avr-gcc-arduino-4.8.1-arduino5" + BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX

json_package_index/package_index.go

@@ -43,7 +43,8 @@ import (
 	"github.com/arduino/arduino-builder/constants"
 	_ "github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	properties "github.com/arduino/go-properties-map"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type core struct {
@@ -101,7 +102,7 @@ var systems = map[string]string{
 
 var globalProperties map[string]properties.Map
 
-func PackageIndexFoldersToPropertiesMap(packages *types.Packages, folders []string) (map[string]properties.Map, error) {
+func PackageIndexFoldersToPropertiesMap(packages *types.Packages, folders []string, specifiedFilenames []string) (map[string]properties.Map, error) {
 
 	var paths []string
 
@@ -113,7 +114,13 @@ func PackageIndexFoldersToPropertiesMap(packages *types.Packages, folders []stri
 		files, _ := ioutil.ReadDir(folder)
 		for _, f := range files {
 			if strings.HasPrefix(f.Name(), "package") && strings.HasSuffix(f.Name(), "index.json") {
-				paths = append(paths, filepath.Join(folder, f.Name()))
+				// if a list of required json has been provided only add them
+				if specifiedFilenames != nil && len(specifiedFilenames) > 1 &&
+					!utils.SliceContains(specifiedFilenames, f.Name()) {
+					continue
+				} else {
+					paths = append(paths, filepath.Join(folder, f.Name()))
+				}
 			}
 		}
 	}