Skip to content

Download library index as a combined archive+signature #1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2022
Merged

Download library index as a combined archive+signature #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b64942
Download library index as a combined archive+signature
cmaglie Oct 5, 2022
138f9f9
Fixed integration tests
cmaglie Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions arduino/libraries/librariesmanager/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ var LibraryIndexGZURL, _ = url.Parse("https://downloads.arduino.cc/libraries/lib

// LibraryIndexSignature is the URL where to get the library index signature.
var LibraryIndexSignature, _ = url.Parse("https://downloads.arduino.cc/libraries/library_index.json.sig")

// LibraryIndexWithSignatureArchiveURL is the URL where to get the library index.
var LibraryIndexWithSignatureArchiveURL, _ = url.Parse("https://downloads.arduino.cc/libraries/library_index.tar.bz2")
3 changes: 1 addition & 2 deletions commands/instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,7 @@ func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexRequ
defer tmp.RemoveAll()

indexResource := resources.IndexResource{
URL: librariesmanager.LibraryIndexGZURL,
SignatureURL: librariesmanager.LibraryIndexSignature,
URL: librariesmanager.LibraryIndexWithSignatureArchiveURL,
}
if err := indexResource.Download(lm.IndexFile.Parent(), downloadCB); err != nil {
return err
Expand Down
6 changes: 2 additions & 4 deletions test/test_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,7 @@ def test_update_index(run_command):
result = run_command(["lib", "update-index"])
assert result.ok
lines = [l.strip() for l in result.stdout.splitlines()]
assert "Downloading index: library_index.json.gz downloaded" in lines
assert "Downloading index signature: library_index.json.sig downloaded" in lines
assert "Downloading index: library_index.tar.bz2 downloaded" in lines


def test_uninstall(run_command):
Expand Down Expand Up @@ -498,8 +497,7 @@ def test_search(run_command):
result = run_command(["lib", "search", "--names"])
assert result.ok
lines = [l.strip() for l in result.stdout.strip().splitlines()]
assert "Downloading index: library_index.json.gz downloaded" in lines
assert "Downloading index signature: library_index.json.sig downloaded" in lines
assert "Downloading index: library_index.tar.bz2 downloaded" in lines
libs = [l[6:].strip('"') for l in lines if "Name:" in l]

expected = {"WiFi101", "WiFi101OTA", "Firebase Arduino based on WiFi101"}
Expand Down
6 changes: 2 additions & 4 deletions test/test_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ def test_update(run_command):
lines = [l.strip() for l in res.stdout.splitlines()]

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 "Downloading index: library_index.tar.bz2 downloaded" in lines


def test_update_showing_outdated(run_command):
Expand All @@ -45,8 +44,7 @@ def test_update_showing_outdated(run_command):
lines = [l.strip() for l in result.stdout.splitlines()]

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 "Downloading index: library_index.tar.bz2 downloaded" in lines
assert lines[-5].startswith("Arduino AVR Boards")
assert lines[-2].startswith("USBHost")

Expand Down