Allow .tar.bz2 package index URL

Author: cmaglie

arduino/cores/packagemanager/package_manager.go

@@ -237,7 +237,11 @@ func (pm *PackageManager) ResolveFQBN(fqbn *cores.FQBN) (
 
 // LoadPackageIndex loads a package index by looking up the local cached file from the specified URL
 func (pm *PackageManager) LoadPackageIndex(URL *url.URL) error {
-	indexPath := pm.IndexDir.Join(path.Base(URL.Path))
+	indexFileName := path.Base(URL.Path)
+	if strings.HasSuffix(indexFileName, ".tar.bz2") {
+		indexFileName = strings.TrimSuffix(indexFileName, ".tar.bz2") + ".json"
+	}
+	indexPath := pm.IndexDir.Join(indexFileName)
 	index, err := packageindex.LoadIndex(indexPath)
 	if err != nil {
 		return fmt.Errorf(tr("loading json index file %[1]s: %[2]s"), indexPath, err)

cli/globals/globals.go

@@ -26,5 +26,5 @@ var (
 	// VersionInfo contains all info injected during build
 	VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
 	// DefaultIndexURL is the default index url
-	DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.json"
+	DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.tar.bz2"
 )

commands/instances.go

@@ -434,7 +434,7 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp
 		indexResource := resources.IndexResource{
 			URL: URL,
 		}
-		if strings.HasSuffix(URL.Host, "arduino.cc") {
+		if strings.HasSuffix(URL.Host, "arduino.cc") && strings.HasSuffix(URL.Path, ".json") {
 			indexResource.SignatureURL, _ = url.Parse(u) // should not fail because we already parsed it
 			indexResource.SignatureURL.Path += ".sig"
 		}

test/test_core.py

@@ -201,7 +201,7 @@ def test_core_install_without_updateindex(run_command):
     # Download samd core pinned to 1.8.6
     result = run_command(["core", "install", "arduino:samd@1.8.6"])
     assert result.ok
-    assert "Downloading index: package_index.json downloaded" in result.stdout
+    assert "Downloading index: package_index.tar.bz2 downloaded" in result.stdout
 
 
 @pytest.mark.skipif(

test/test_update.py

@@ -21,8 +21,7 @@ def test_update(run_command):
     assert res.ok
     lines = [l.strip() for l in res.stdout.splitlines()]
 
-    assert "Downloading index: package_index.json downloaded" in lines
-    assert "Downloading index signature: package_index.json.sig downloaded" in lines
+    assert "Downloading index: package_index.tar.bz2 downloaded" in lines
     assert "Downloading index: library_index.json.gz downloaded" in lines
     assert "Downloading index signature: library_index.json.sig downloaded" in lines
 
@@ -45,8 +44,7 @@ def test_update_showing_outdated(run_command):
     assert result.ok
     lines = [l.strip() for l in result.stdout.splitlines()]
 
-    assert "Downloading index: package_index.json downloaded" in lines
-    assert "Downloading index signature: package_index.json.sig downloaded" in lines
+    assert "Downloading index: package_index.tar.bz2 downloaded" in lines
     assert "Downloading index: library_index.json.gz downloaded" in lines
     assert "Downloading index signature: library_index.json.sig downloaded" in lines
     assert lines[-5].startswith("Arduino AVR Boards")