rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-17 06:52:18 +01:00
Code Issues Releases Activity

Fallback to stock library_index.json file if the copy in .arduino15 is missing/corrupted or if it the downloaded one if corrupted. Fixes #3778

Browse Source
This commit is contained in:
Federico Fissore 2015-09-25 12:54:50 +02:00
parent 3872f5d315
commit f511c2451f
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
View File

@ -109,6 +109,11 @@ public class LibrariesIndexer {
// Clear all installed flags // Clear all installed flags
installedLibraries.clear(); installedLibraries.clear();
installedLibrariesWithDuplicates.clear(); installedLibrariesWithDuplicates.clear();
if (index.getLibraries() == null) {
return;
}
for (ContributedLibrary lib : index.getLibraries()) { for (ContributedLibrary lib : index.getLibraries()) {
lib.setInstalled(false); lib.setInstalled(false);
} }

23
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -592,11 +592,7 @@ public class BaseNoGui {
try { try {
indexer.parseIndex(); indexer.parseIndex();
} catch (JsonProcessingException e) { } catch (JsonProcessingException | SignatureVerificationFailedException e) {
FileUtils.deleteIfExists(indexFile);
FileUtils.deleteIfExists(indexSignatureFile);
throw e;
} catch (SignatureVerificationFailedException e) {
FileUtils.deleteIfExists(indexFile); FileUtils.deleteIfExists(indexFile);
FileUtils.deleteIfExists(indexSignatureFile); FileUtils.deleteIfExists(indexSignatureFile);
throw e; throw e;
@ -611,6 +607,17 @@ public class BaseNoGui {
librariesIndexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder(), indexer); librariesIndexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder(), indexer);
File librariesIndexFile = librariesIndexer.getIndexFile(); File librariesIndexFile = librariesIndexer.getIndexFile();
copyStockLibraryIndexIfUpstreamIsMissing(librariesIndexFile);
try {
librariesIndexer.parseIndex();
} catch (JsonProcessingException e) {
FileUtils.deleteIfExists(librariesIndexFile);
copyStockLibraryIndexIfUpstreamIsMissing(librariesIndexFile);
librariesIndexer.parseIndex();
}
}
private static void copyStockLibraryIndexIfUpstreamIsMissing(File librariesIndexFile) throws IOException {
if (!librariesIndexFile.isFile()) { if (!librariesIndexFile.isFile()) {
File defaultLibraryJsonFile = new File(getContentFile("dist"), "library_index.json"); File defaultLibraryJsonFile = new File(getContentFile("dist"), "library_index.json");
if (defaultLibraryJsonFile.isFile()) { if (defaultLibraryJsonFile.isFile()) {
@ -628,12 +635,6 @@ public class BaseNoGui {
} }
} }
} }
try {
librariesIndexer.parseIndex();
} catch (JsonProcessingException e) {
FileUtils.deleteIfExists(librariesIndexFile);
throw e;
}
} }
static protected void initPlatform() { static protected void initPlatform() {