Commit b1e25f3

committed

Allow .tar.bz2 package index URL

1 parent 1583929 commit b1e25f3Copy full SHA for b1e25f3

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 5 additions & 1 deletion

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

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ def test_core_install_without_updateindex(run_command):`
`201`	`201`	`# Download samd core pinned to 1.8.6`
`202`	`202`	`result = run_command(["core", "install", "arduino:samd@1.8.6"])`
`203`	`203`	`assert result.ok`
`204`		`- assert "Downloading index: package_index.json downloaded" in result.stdout`
	`204`	`+ assert "Downloading index: package_index.tar.bz2 downloaded" in result.stdout`
`205`	`205`
`206`	`206`
`207`	`207`	`@pytest.mark.skipif(`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ def test_update(run_command):`
`21`	`21`	`assert res.ok`
`22`	`22`	`lines = [l.strip() for l in res.stdout.splitlines()]`
`23`	`23`
`24`		`- assert "Downloading index: package_index.json downloaded" in lines`
`25`		`- assert "Downloading index signature: package_index.json.sig downloaded" in lines`
	`24`	`+ assert "Downloading index: package_index.tar.bz2 downloaded" in lines`
`26`	`25`	`assert "Downloading index: library_index.json.gz downloaded" in lines`
`27`	`26`	`assert "Downloading index signature: library_index.json.sig downloaded" in lines`
`28`	`27`
`@@ -45,8 +44,7 @@ def test_update_showing_outdated(run_command):`
`45`	`44`	`assert result.ok`
`46`	`45`	`lines = [l.strip() for l in result.stdout.splitlines()]`
`47`	`46`
`48`		`- assert "Downloading index: package_index.json downloaded" in lines`
`49`		`- assert "Downloading index signature: package_index.json.sig downloaded" in lines`
	`47`	`+ assert "Downloading index: package_index.tar.bz2 downloaded" in lines`
`50`	`48`	`assert "Downloading index: library_index.json.gz downloaded" in lines`
`51`	`49`	`assert "Downloading index signature: library_index.json.sig downloaded" in lines`
`52`	`50`	`assert lines[-5].startswith("Arduino AVR Boards")`

Comments

(0)