rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Slightly refactored ContributionsIndexer.syncBuiltInHardware()

Browse Source 
This is just a small rewrite of the function in a more clear way,
no change in behavior.
This commit is contained in:
Cristian Maglie 2016-08-11 13:33:08 +02:00
parent e80c085996
commit b1f9164c4c
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
View File

@ -212,20 +212,28 @@ public class ContributionsIndexer {
}
for (File folder : builtInHardwareFolder.listFiles(ONLY_DIRS)) {
ContributedPackage pack = index.findPackage(folder.getName());
if (pack != null) {
syncBuiltInPackageWithFilesystem(pack, folder);
if (pack == null)
continue;
syncBuiltInPackageWithFilesystem(pack, folder);
File toolsFolder = new File(builtInHardwareFolder, "tools");
if (toolsFolder.isDirectory()) {
for (File toolFolder : toolsFolder.listFiles(ONLY_DIRS)) {
File builtInToolsMetadata = new File(toolFolder, "builtin_tools_versions.txt");
if (builtInToolsMetadata.isFile()) {
PreferencesMap toolsMetadata = new PreferencesMap(builtInToolsMetadata).subTree(pack.getName());
for (Map.Entry<String, String> toolMetadata : toolsMetadata.entrySet()) {
syncToolWithFilesystem(pack, toolFolder, toolMetadata.getKey(), toolMetadata.getValue());
}
}
}
File toolsFolder = new File(builtInHardwareFolder, "tools");
if (!toolsFolder.isDirectory())
continue;
for (File toolFolder : toolsFolder.listFiles(ONLY_DIRS)) {
// builtin_tools_versions.txt contains tools versions in the format:
// "PACKAGER.TOOL_NAME=TOOL_VERSION"
// for example:
// "arduino.avrdude=6.0.1-arduino5"
File versionsFile = new File(toolFolder, "builtin_tools_versions.txt");
if (!versionsFile.isFile())
continue;
PreferencesMap toolsVersion = new PreferencesMap(versionsFile).subTree(pack.getName());
for (String name : toolsVersion.keySet()) {
String version = toolsVersion.get(name);
syncToolWithFilesystem(pack, toolFolder, name, version);
}
}
}