rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-28 09:24:14 +01:00
Code Issues Releases Activity

Filter ContributedPlatformReleases after fully building them

Browse Source
This commit is contained in:
Cristian Maglie 2021-05-11 14:31:12 +02:00
parent cec4f41dd7
commit aef6d2ac98
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/cc/arduino/contributions/packages/ui/ContributedPlatformReleases.java
View File

@ -61,12 +61,6 @@ public class ContributedPlatformReleases {
return platform.getArchitecture().equals(arch);
}
public boolean contains(ContributedPlatform platform) {
return (platform.getParentPackage().equals(packager)
&& platform.getArchitecture().equals(arch)
&& versions.contains(platform.getParsedVersion()));
}
public void add(ContributedPlatform platform) {
releases.add(platform);
String version = platform.getParsedVersion();

31
app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
View File

@ -60,30 +60,32 @@ public class ContributionIndexTableModel
private void updateContributions() {
contributions.clear();
// Generate ContributedPlatformReleases from all platform releases
for (ContributedPackage pack : BaseNoGui.indexer.getPackages()) {
for (ContributedPlatform platform : pack.getPlatforms()) {
addContribution(platform);
}
}
// Filter ContributedPlatformReleases based on search terms
contributions.removeIf(releases -> {
for (ContributedPlatform platform : releases.releases) {
String compoundTargetSearchText = platform.getName() + "\n"
+ platform.getBoards().stream()
.map(ContributedBoard::getName)
.collect(Collectors.joining(" "));
// Add all the versions of the same core, even if there's no match
for (ContributedPlatformReleases contribution : contributions) {
if (contribution.shouldContain(platform)) {
addContribution(platform);
continue;
}
}
if (!filter.test(platform)) {
continue;
}
if (!stringContainsAll(compoundTargetSearchText, filters))
continue;
addContribution(platform);
return false;
}
}
return true;
});
// Sort ContributedPlatformReleases and put deprecated platforms to the bottom
Collections.sort(contributions, (x,y)-> {
if (x.isDeprecated() != y.isDeprecated()) {
return x.isDeprecated() ? 1 : -1;
@ -96,6 +98,7 @@ public class ContributionIndexTableModel
}
return x1.getName().compareToIgnoreCase(y1.getName());
});
fireTableDataChanged();
}
@ -123,10 +126,6 @@ public class ContributionIndexTableModel
if (!contribution.shouldContain(platform)) {
continue;
}
if (contribution.contains(platform)) {
// no duplicates
return;
}
contribution.add(platform);
return;
}