Fixed ignoring of LIBRARY_INDEX_URL system property #6494
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xardael
changed the title
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LibraryInstaller uses only GZippedJsonDownloader,
https://github.com/arduino/Arduino/blob/master/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java#L65
which should fall back to JsonDwnloader only if the downloading of gziped JSON fails. (In catch block)
https://github.com/arduino/Arduino/blob/master/arduino-core/src/cc/arduino/contributions/GZippedJsonDownloader.java#L54
But if I set LIBRARY_INDEX_URL system property, which is then stored into LIBRARY_INDEX_URL constant, it will be ignored since the LIBRARY_INDEX_URL_GZ takes precedence, and it is set to arduino.cc's librayr_index.json.
So I introduced the possibility to set system property for Gzipped JSON URL as well, and moreover when the LIBRARY_INDEX_URL system property is set and LIBRARY_INDEX_URL_GZ is not, it will get empty string value, and the try block in GZippedJson downloader will fail and JsonDownloader from the catch block will be called.