Merge pull request #125 from arduino/download_versions

Find the tool given the packager

Author: mastrolinux

hub.go

@@ -192,8 +192,9 @@ func checkCmd(m []byte) {
 	} else if strings.HasPrefix(sl, "downloadtool") {
 		go func() {
 			args := strings.Split(s, " ")
-			var tool, toolVersion, behaviour string
+			var tool, toolVersion, pack, behaviour string
 			toolVersion = "latest"
+			pack = "arduino"
 			behaviour = "keep"
 			if len(args) <= 1 {
 				mapD := map[string]string{"DownloadStatus": "Error", "Msg": "Not enough arguments"}
@@ -205,13 +206,20 @@ func checkCmd(m []byte) {
 				tool = args[1]
 			}
 			if len(args) > 2 {
-				toolVersion = args[2]
+				if strings.HasPrefix(args[2], "http") {
+					//old APIs, ignore this field
+				} else {
+					toolVersion = args[2]
+				}
 			}
 			if len(args) > 3 {
-				behaviour = args[3]
+				pack = args[3]
+			}
+			if len(args) > 4 {
+				behaviour = args[4]
 			}
 
-			err := Tools.Download(tool, toolVersion, behaviour)
+			err := Tools.Download(pack, tool, toolVersion, behaviour)
 			if err != nil {
 				mapD := map[string]string{"DownloadStatus": "Error", "Msg": err.Error()}
 				mapB, _ := json.Marshal(mapD)

tools/download.go

@@ -130,6 +130,7 @@ func (t *Tools) DownloadPackageIndex(index_file, signature_file string) error {
 // It will extract it in a folder in .arduino-create, and it will update the
 // Installed map.
 //
+// pack contains the packager of the tool
 // name contains the name of the tool.
 // version contains the version of the tool.
 // behaviour contains the strategy to use when there is already a tool installed
@@ -140,7 +141,7 @@ func (t *Tools) DownloadPackageIndex(index_file, signature_file string) error {
 // If version is not "latest" and behaviour is "replace", it will download the
 // version again. If instead behaviour is "keep" it will not download the version
 // if it already exists.
-func (t *Tools) Download(name, version, behaviour string) error {
+func (t *Tools) Download(pack, name, version, behaviour string) error {
 
 	index_file := path.Join(t.Directory, "package_index.json")
 	signature_file := path.Join(t.Directory, "package_index.json.sig")
@@ -169,10 +170,10 @@ func (t *Tools) Download(name, version, behaviour string) error {
 	t.Logger.Println(string(body))
 
 	// Find the tool by name
-	correctTool, correctSystem := findTool(name, version, data)
+	correctTool, correctSystem := findTool(pack, name, version, data)
 
 	if correctTool.Name == "" || correctSystem.URL == "" {
-		t.Logger.Println("We couldn't find a tool with the name " + name + " and version " + version)
+		t.Logger.Println("We couldn't find a tool with the name " + name + " and version " + version + " packaged by " + pack)
 		return nil
 	}
 
@@ -255,11 +256,14 @@ func (t *Tools) Download(name, version, behaviour string) error {
 	return t.writeMap()
 }
 
-func findTool(name, version string, data index) (tool, system) {
+func findTool(pack, name, version string, data index) (tool, system) {
 	var correctTool tool
 	correctTool.Version = "0.0"
 
 	for _, p := range data.Packages {
+		if p.Name != pack {
+			continue
+		}
 		for _, t := range p.Tools {
 			if version != "latest" {
 				if t.Name == name && t.Version == version {