Library manager through arduino-cli (WIP, part 1)

- library index is now fetched arduino-cli
- ContributedLibraries and derivatives classes have been adapted
  to arduino-cli structure
- install/update/remove are temporary disabled
- library index updated is now done trough arduino-cli
- added progress wrapper

Next steps:

- detect installed libraries using arduino-cli
- implement install/update/remove using arduino-cli

Author: cmaglie

app/src/cc/arduino/contributions/libraries/filters/UpdatableLibraryPredicate.java

@@ -29,15 +29,14 @@
 
 package cc.arduino.contributions.libraries.filters;
 
-import java.util.List;
 import java.util.function.Predicate;
 
-import cc.arduino.contributions.VersionComparator;
+import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import processing.app.BaseNoGui;
 
-public class UpdatableLibraryPredicate implements Predicate<ContributedLibraryRelease> {
+public class UpdatableLibraryPredicate implements Predicate<ContributedLibrary> {
 
   LibrariesIndexer librariesIndexer;
 
@@ -50,13 +49,11 @@ public UpdatableLibraryPredicate(LibrariesIndexer indexer) {
   }
 
   @Override
-  public boolean test(ContributedLibraryRelease lib) {
-    if (!lib.isLibraryInstalled()) {
+  public boolean test(ContributedLibrary lib) {
+    if (!lib.getInstalled().isPresent()) {
       return false;
     }
-    String libraryName = lib.getName();
-    List<ContributedLibraryRelease> libraries = librariesIndexer.getIndex().find(libraryName);
-    ContributedLibraryRelease latest = libraries.stream().reduce(VersionComparator::max).get();
+    ContributedLibraryRelease latest = lib.getLatest().get(); // it must be present
     return !latest.isLibraryInstalled();
   }
 }

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java renamed to app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryComparatorWithTypePriority.java

@@ -36,18 +36,18 @@
 import java.util.Comparator;
 import java.util.List;
 
-public class ContributedLibraryReleasesComparator implements Comparator<ContributedLibrary> {
+public class ContributedLibraryComparatorWithTypePriority implements Comparator<ContributedLibrary> {
 
   private final String firstType;
 
-  public ContributedLibraryReleasesComparator(String firstType) {
+  public ContributedLibraryComparatorWithTypePriority(String firstType) {
     this.firstType = firstType;
   }
 
   @Override
   public int compare(ContributedLibrary o1, ContributedLibrary o2) {
-    ContributedLibraryRelease lib1 = o1.getLatest();
-    ContributedLibraryRelease lib2 = o2.getLatest();
+    ContributedLibraryRelease lib1 = o1.getLatest().get();
+    ContributedLibraryRelease lib2 = o2.getLatest().get();
 
     List<String> types1 = lib1.getTypes();
     List<String> types2 = lib2.getTypes();

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellEditor.java

@@ -33,6 +33,8 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -43,52 +45,52 @@
 
 import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.VersionComparator;
-import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.ContributedLibrary;
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.utils.ReverseComparator;
 
 @SuppressWarnings("serial")
 public class ContributedLibraryTableCellEditor extends InstallerTableCell {
 
-  private ContributedLibrary editorValue;
+  private ContributedLibrary editorLibrary;
   private ContributedLibraryTableCellJPanel editorCell;
 
   @Override
   public Object getCellEditorValue() {
-    return editorValue;
+    return editorLibrary;
   }
 
   @Override
   public Component getTableCellEditorComponent(JTable table, Object value,
                                                boolean isSelected, int row,
                                                int column) {
-    editorValue = (ContributedLibrary) value;
+    editorLibrary = (ContributedLibrary) value;
 
     editorCell = new ContributedLibraryTableCellJPanel(table, value, true);
     editorCell.installButton
-        .addActionListener(e -> onInstall(editorValue.getSelected(),
-                                          editorValue.getInstalled()));
+        .addActionListener(e -> onInstall(editorLibrary.getSelected().get(),
+                                          editorLibrary.getInstalled()));
     editorCell.downgradeButton.addActionListener(e -> {
       JComboBox chooser = editorCell.downgradeChooser;
       ContributedLibraryRelease lib = (ContributedLibraryRelease) chooser.getSelectedItem();
-      onInstall(lib, editorValue.getInstalled());
+      onInstall(lib, editorLibrary.getInstalled());
     });
     editorCell.versionToInstallChooser.addActionListener(e -> {
-      editorValue.select((ContributedLibraryRelease) editorCell.versionToInstallChooser.getSelectedItem());
+      editorLibrary.select((ContributedLibraryRelease) editorCell.versionToInstallChooser.getSelectedItem());
       if (editorCell.versionToInstallChooser.getSelectedIndex() != 0) {
         InstallerTableCell.dropdownSelected(true);
       }
     });
 
     setEnabled(true);
 
-    final Optional<ContributedLibraryRelease> mayInstalled = editorValue.getInstalled();
+    final Optional<ContributedLibraryRelease> mayInstalled = editorLibrary.getInstalled();
 
-    List<ContributedLibraryRelease> releases = editorValue.getReleases();
-    List<ContributedLibraryRelease> notInstalled = new LinkedList<>(releases);
+    Collection<ContributedLibraryRelease> releases = editorLibrary.getReleases();
+    List<ContributedLibraryRelease> notInstalled = new ArrayList<>(releases);
     if (mayInstalled.isPresent()) {
-      notInstalled.remove(editorValue.getInstalled().get());
+      notInstalled.remove(mayInstalled.get());
     }
 
     Collections.sort(notInstalled, new ReverseComparator<>(

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java

@@ -119,7 +119,7 @@ public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
     if (releases == null)
       return;
 
-    ContributedLibraryRelease selected = releases.getSelected();
+    ContributedLibraryRelease selected = releases.getSelected().get();
     TitledBorder titledBorder = BorderFactory.createTitledBorder(selected.getName());
     titledBorder.setTitleFont(getFont().deriveFont(Font.BOLD));
     setBorder(titledBorder);

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java

@@ -54,7 +54,7 @@ public Predicate<ContributedLibrary> getFilterPredicate() {
     return new Predicate<ContributedLibrary>() {
       @Override
       public boolean test(ContributedLibrary rel) {
-        ContributedLibraryRelease lib = rel.getLatest();
+        ContributedLibraryRelease lib = rel.getLatest().get();
         return category.equals(lib.getCategory());
       }
     };

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfTypeItem.java

@@ -54,7 +54,7 @@ public Predicate<ContributedLibrary> getFilterPredicate() {
     return new Predicate<ContributedLibrary>() {
       @Override
       public boolean test(ContributedLibrary lib) {
-        List<String> types = lib.getLatest().getTypes();
+        List<String> types = lib.getLatest().get().getTypes();
         return types != null && types.contains(type);
       }
     };

app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java

@@ -36,6 +36,7 @@
 import processing.app.BaseNoGui;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
@@ -131,7 +132,7 @@ public ContributedLibrary getReleases(int row) {
   }
 
   public ContributedLibraryRelease getSelectedRelease(int row) {
-    return contributions.get(row).getSelected();
+    return contributions.get(row).getSelected().get();
   }
 
   public void update() {
@@ -144,7 +145,7 @@ private boolean filterCondition(ContributedLibrary lib) {
       return false;
     }
 
-    ContributedLibraryRelease latest = lib.getLatest();
+    ContributedLibraryRelease latest = lib.getLatest().get();
     String compoundTargetSearchText = latest.getName() + " "
                                       + latest.getParagraph() + " "
                                       + latest.getSentence();
@@ -158,55 +159,12 @@ private boolean filterCondition(ContributedLibrary lib) {
     return true;
   }
 
-  public void updateLibrary(ContributedLibraryRelease lib) {
-    // Find the row interested in the change
-    int row = -1;
-    for (ContributedLibrary releases : contributions) {
-      if (releases.shouldContain(lib))
-        row = contributions.indexOf(releases);
-    }
-
-    updateContributions();
-
-    // If the library is found in the list send update event
-    // or insert event on the specific row...
-    for (ContributedLibrary releases : contributions) {
-      if (releases.shouldContain(lib)) {
-        if (row == -1) {
-          row = contributions.indexOf(releases);
-          fireTableRowsInserted(row, row);
-        } else {
-          fireTableRowsUpdated(row, row);
-        }
-        return;
-      }
-    }
-    // ...otherwise send a row deleted event
-    fireTableRowsDeleted(row, row);
-  }
-
-  private List<ContributedLibrary> rebuildContributionsFromIndex() {
-    List<ContributedLibrary> res = new ArrayList<>();
-    BaseNoGui.librariesIndexer.getIndex().getLibraries(). //
-        forEach(lib -> {
-          for (ContributedLibrary contribution : res) {
-            if (!contribution.shouldContain(lib))
-              continue;
-            contribution.add(lib);
-            return;
-          }
-
-          res.add(new ContributedLibrary(lib));
-        });
-    return res;
-  }
-
   private void updateContributions() {
-    List<ContributedLibrary> all = rebuildContributionsFromIndex();
+    Collection<ContributedLibrary> all = BaseNoGui.librariesIndexer.getIndex().getLibraries();
     contributions.clear();
     all.stream().filter(this::filterCondition).forEach(contributions::add);
     Collections.sort(contributions,
-                     new ContributedLibraryReleasesComparator("Arduino"));
+                     new ContributedLibraryComparatorWithTypePriority("Arduino"));
   }
 
 }

app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java

@@ -200,7 +200,7 @@ protected void onUpdatePressed() {
     installerThread = new Thread(() -> {
       try {
         setProgressVisible(true, "");
-        installer.updateIndex(this::setProgress);
+        BaseNoGui.getArduinoCoreService().updateLibrariesIndex(this::setProgress);
         ((LibrariesIndexTableModel) contribModel).update();
         onIndexesUpdated();
       } catch (Exception e) {
@@ -215,7 +215,7 @@ protected void onUpdatePressed() {
   }
 
   public void onInstallPressed(final ContributedLibraryRelease lib) {
-    List<ContributedLibraryRelease> deps = BaseNoGui.librariesIndexer.getIndex().resolveDependeciesOf(lib);
+    List<ContributedLibraryRelease> deps = BaseNoGui.getArduinoCoreService().libraryResolveDependecies(lib);
     boolean depsInstalled = deps.stream().allMatch(l -> l.getInstalledLibrary().isPresent() || l.getName().equals(lib.getName()));
     Result installDeps;
     if (!depsInstalled) {

app/src/processing/app/Base.java

@@ -27,6 +27,7 @@
 import cc.arduino.UpdatableBoardsLibsFakeURLsHandler;
 import cc.arduino.UploaderUtils;
 import cc.arduino.contributions.*;
+import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import cc.arduino.contributions.libraries.LibraryInstaller;
@@ -300,7 +301,7 @@ public Base(String[] args) throws Exception {
 
     final GPGDetachedSignatureVerifier gpgDetachedSignatureVerifier = new GPGDetachedSignatureVerifier();
     contributionInstaller = new ContributionInstaller(BaseNoGui.getPlatform(), gpgDetachedSignatureVerifier);
-    libraryInstaller = new LibraryInstaller(BaseNoGui.getPlatform(), gpgDetachedSignatureVerifier);
+    libraryInstaller = new LibraryInstaller(BaseNoGui.getPlatform());
 
     parser.parseArgumentsPhase2();
 
@@ -360,15 +361,15 @@ public Base(String[] args) throws Exception {
       BaseNoGui.onBoardOrPortChange();
 
       ProgressListener progressListener = new ConsoleProgressListener();
-      libraryInstaller.updateIndex(progressListener);
+      BaseNoGui.getArduinoCoreService().updateLibrariesIndex(progressListener);
 
-      LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder());
-      indexer.parseIndex();
+      LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getArduinoCoreService());
+      indexer.regenerateIndex();
       indexer.setLibrariesFolders(BaseNoGui.getLibrariesFolders());
       indexer.rescanLibraries();
 
-      for (String library : parser.getLibraryToInstall().split(",")) {
-        String[] libraryToInstallParts = library.split(":");
+      for (String libraryArg : parser.getLibraryToInstall().split(",")) {
+        String[] libraryToInstallParts = libraryArg.split(":");
 
         ContributedLibraryRelease selected = null;
         if (libraryToInstallParts.length == 2) {
@@ -377,12 +378,11 @@ public Base(String[] args) throws Exception {
             System.out.println(format(tr("Invalid version {0}"), libraryToInstallParts[1]));
             System.exit(1);
           }
-          selected = indexer.getIndex().find(libraryToInstallParts[0], version.get().toString());
+          selected = indexer.getIndex().find(libraryToInstallParts[0], version.get().toString()).orElse(null);
         } else if (libraryToInstallParts.length == 1) {
-          List<ContributedLibraryRelease> librariesByName = indexer.getIndex().find(libraryToInstallParts[0]);
-          Collections.sort(librariesByName, new DownloadableContributionVersionComparator());
-          if (!librariesByName.isEmpty()) {
-            selected = librariesByName.get(librariesByName.size() - 1);
+          ContributedLibrary library = indexer.getIndex().find(libraryToInstallParts[0]).orElse(null);
+          if (library != null) {
+            selected = library.getLatest().orElse(null);
           }
         }
         if (selected == null) {
@@ -394,7 +394,7 @@ public Base(String[] args) throws Exception {
         if (mayInstalled.isPresent() && selected.isIDEBuiltIn()) {
           System.out.println(tr(I18n
               .format("Library {0} is available as built-in in the IDE.\nRemoving the other version {1} installed in the sketchbook...",
-                      library, mayInstalled.get().getParsedVersion())));
+                      libraryArg, mayInstalled.get().getParsedVersion())));
           libraryInstaller.remove(mayInstalled.get(), progressListener);
         } else {
           libraryInstaller.install(selected, progressListener);