Commit afe204f

committed

Merge pull request arduino#4828 from facchinm/issue_4762

Filter examples based on contributed libraries by architecture

2 parents b37430b + c28c854 commit afe204fCopy full SHA for afe204f

File tree

+19

-7

lines changed

app/src/processing/app
- Base.java
arduino-core/src
- cc/arduino/contributions/libraries
  - LibrariesIndexer.java
- processing/app/packages
  - LibraryList.java

+19

-7

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public class Base {`
`82`	`82`
`83`	`83`	`public static final Predicate<UserLibrary> CONTRIBUTED = library -> library.getTypes() == null \|\| library.getTypes().isEmpty() \|\| library.getTypes().contains("Contributed");`
`84`	`84`	`public static final Predicate<UserLibrary> RETIRED = library -> library.getTypes() != null && library.getTypes().contains("Retired");`
	`85`	`+ public static final Predicate<UserLibrary> COMPATIBLE = library -> library.getArchitectures() != null && (library.getArchitectures().contains("*") \|\| library.getArchitectures().contains(BaseNoGui.getTargetPlatform().getId()));`
`85`	`86`
`86`	`87`	`private static final int RECENT_SKETCHES_MAX_SIZE = 10;`
`87`	`88`
`@@ -1104,6 +1105,7 @@ public LibraryList getIDELibs() {`
`1104`	`1105`	`List<UserLibrary> libs = installedLibraries.stream()`
`1105`	`1106`	`.filter(CONTRIBUTED.negate())`
`1106`	`1107`	`.filter(RETIRED.negate())`
	`1108`	`+ .filter(COMPATIBLE)`
`1107`	`1109`	`.collect(Collectors.toList());`
`1108`	`1110`	`return new LibraryList(libs);`
`1109`	`1111`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -187,11 +187,11 @@ private void scanLibrary(File folder, boolean isSketchbook) throws IOException {`
`187`	`187`	`if (headers.length == 0) {`
`188`	`188`	`throw new IOException(lib.getSrcFolder().getAbsolutePath());`
`189`	`189`	`}`
`190`		`- installedLibraries.addOrReplace(lib);`
	`190`	`+ installedLibraries.addOrReplaceArchAware(lib);`
`191`	`191`	`if (isSketchbook) {`
`192`	`192`	`installedLibrariesWithDuplicates.add(lib);`
`193`	`193`	`} else {`
`194`		`- installedLibrariesWithDuplicates.addOrReplace(lib);`
	`194`	`+ installedLibrariesWithDuplicates.addOrReplaceArchAware(lib);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`// Check if we can find the same library in the index`

Lines changed: 15 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,15 +57,25 @@ public synchronized UserLibrary getByName(String name) {`
`57`	`57`	`return null;`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public synchronized void addOrReplaceArchAware(UserLibrary lib) {`
	`61`	`+ addOrReplace(lib, true);`
	`62`	`+ }`
	`63`	`+`
`60`	`64`	`public synchronized void addOrReplace(UserLibrary lib) {`
`61`		`- remove(lib);`
	`65`	`+ addOrReplace(lib, false);`
	`66`	`+ }`
	`67`	`+`
	`68`	`+ public synchronized void addOrReplace(UserLibrary lib, boolean archAware) {`
	`69`	`+ remove(lib, archAware);`
`62`	`70`	`add(lib);`
`63`	`71`	`}`
`64`		`-`
`65`		`- public synchronized void remove(UserLibrary lib) {`
	`72`	`+`
	`73`	`+ public synchronized void remove(UserLibrary lib, booleanarchAware) {`
`66`	`74`	`UserLibrary l = getByName(lib.getName());`
`67`		`- if (l != null)`
`68`		`- super.remove(l);`
	`75`	`+ if (l != null) {`
	`76`	`+ if (!archAware \|\| lib.getArchitectures().contains("*") \|\| lib.getArchitectures().containsAll(l.getArchitectures()))`
	`77`	`+ super.remove(l);`
	`78`	`+ }`
`69`	`79`	`}`
`70`	`80`
`71`	`81`	`public synchronized void sort() {`

Comments

(0)