rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Fixed LibrariesIndex.getInstalled(..) method

Browse Source
This commit is contained in:
Cristian Maglie 2018-01-22 13:01:59 +01:00
parent 86441e4341
commit 62882e0a4d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java
View File

@ -30,6 +30,7 @@
package cc.arduino.contributions.libraries; package cc.arduino.contributions.libraries;
import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator; import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
import cc.arduino.contributions.VersionComparator;
import cc.arduino.contributions.libraries.filters.LibraryWithNamePredicate; import cc.arduino.contributions.libraries.filters.LibraryWithNamePredicate;
import java.util.*; import java.util.*;
@ -91,13 +92,14 @@ public abstract class LibrariesIndex {
} }
public Optional<ContributedLibrary> getInstalled(String name) { public Optional<ContributedLibrary> getInstalled(String name) {
List<ContributedLibrary> installedReleases = find(name).stream().filter(l -> l.isLibraryInstalled()).collect(Collectors.toList()); return find(name).stream() //
Collections.sort(installedReleases, new DownloadableContributionBuiltInAtTheBottomComparator()); .filter(l -> l.isLibraryInstalled()) //
.reduce((x, y) -> {
if (installedReleases.isEmpty()) { if (x.isIDEBuiltIn() == y.isIDEBuiltIn()) {
return Optional.empty(); return VersionComparator.max(x, y);
} } else {
return x.isIDEBuiltIn() ? y : x;
return Optional.of(installedReleases.get(0)); }
});
} }
} }