Removed no more needed LibraryInstaller (it's now done via GRPC)

cmaglie · cmaglie · commit bdd621786a40 · 2020-07-24T12:37:53.000+02:00
diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java b/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java
@@ -49,8 +49,8 @@
 import javax.swing.table.TableCellRenderer;
 
 import cc.arduino.contributions.libraries.ContributedLibraryRelease;
+import cc.arduino.cli.ArduinoCoreInstance;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.LibraryInstaller;
 import cc.arduino.contributions.libraries.LibraryTypeComparator;
 import cc.arduino.contributions.libraries.ui.MultiLibraryInstallDialog.Result;
 import cc.arduino.contributions.ui.DropdownItem;
@@ -64,8 +64,8 @@
 @SuppressWarnings("serial")
 public class LibraryManagerUI extends InstallerJDialog<ContributedLibrary> {
 
+  private final ArduinoCoreInstance core;
   private final JComboBox typeChooser;
-  private final LibraryInstaller installer;
 
   @Override
   protected FilteredAbstractTableModel createContribModel() {
@@ -100,9 +100,9 @@ protected void onRemove(ContributedLibraryRelease library) {
     };
   }
 
-  public LibraryManagerUI(Frame parent, LibraryInstaller installer) {
+  public LibraryManagerUI(Frame parent, ArduinoCoreInstance core) {
     super(parent, tr("Library Manager"), Dialog.ModalityType.APPLICATION_MODAL, tr("Unable to reach Arduino.cc due to possible network issues."));
-    this.installer = installer;
+    this.core = core;
 
     filtersContainer.add(new JLabel(tr("Topic")), 1);
     filtersContainer.remove(2);
@@ -218,7 +218,7 @@ protected void onUpdatePressed() {
   }
 
   public void onInstallPressed(final ContributedLibraryRelease lib) {
-    List<ContributedLibraryRelease> deps = BaseNoGui.getArduinoCoreService().libraryResolveDependecies(lib);
+    List<ContributedLibraryRelease> deps = core.libraryResolveDependecies(lib);
     boolean depsInstalled = deps.stream().allMatch(l -> l.getInstalledLibrary().isPresent() || l.getName().equals(lib.getName()));
     Result installDeps;
     if (!depsInstalled) {
@@ -237,9 +237,11 @@ public void onInstallPressed(final ContributedLibraryRelease lib) {
       try {
         setProgressVisible(true, tr("Installing..."));
         if (installDeps == Result.ALL) {
-          installer.install(deps, this::setProgress);
+          deps.forEach(dep -> {
+            core.libraryInstall(dep, this::setProgress);
+          });
         } else {
-          installer.install(lib, this::setProgress);
+          core.libraryInstall(lib, this::setProgress);
         }
         onIndexesUpdated();
         if (contribTable.getCellEditor() != null) {
@@ -271,7 +273,7 @@ public void onRemovePressed(final ContributedLibraryRelease lib) {
     installerThread = new Thread(() -> {
       try {
         setProgressVisible(true, tr("Removing..."));
-        installer.remove(lib, this::setProgress);
+        core.libraryRemove(lib, this::setProgress);
         onIndexesUpdated();
         if (contribTable.getCellEditor() != null) {
           contribTable.getCellEditor().stopCellEditing();
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -30,7 +30,6 @@
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
-import cc.arduino.contributions.libraries.LibraryInstaller;
 import cc.arduino.contributions.libraries.LibraryOfSameTypeComparator;
 import cc.arduino.contributions.libraries.ui.LibraryManagerUI;
 import cc.arduino.contributions.packages.ContributedPlatform;
@@ -98,7 +97,6 @@ public class Base {
 
   public static Map<String, Object> FIND_DIALOG_STATE = new HashMap<>();
   private final ContributionInstaller contributionInstaller;
-  private final LibraryInstaller libraryInstaller;
   private ContributionsSelfCheck contributionsSelfCheck;
 
   // set to true after the first time the menu is built.
@@ -302,7 +300,6 @@ public Base(String[] args) throws Exception {
 
     final GPGDetachedSignatureVerifier gpgDetachedSignatureVerifier = new GPGDetachedSignatureVerifier();
     contributionInstaller = new ContributionInstaller(BaseNoGui.getPlatform(), gpgDetachedSignatureVerifier);
-    libraryInstaller = new LibraryInstaller(BaseNoGui.getPlatform());
 
     parser.parseArgumentsPhase2();
 
@@ -395,9 +392,9 @@ public Base(String[] args) throws Exception {
           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...",
                       libraryArg, mayInstalled.get().getParsedVersion())));
-          libraryInstaller.remove(mayInstalled.get(), progressListener);
+          BaseNoGui.getArduinoCoreService().libraryRemove(mayInstalled.get(), progressListener);
         } else {
-          libraryInstaller.install(selected, progressListener);
+          BaseNoGui.getArduinoCoreService().libraryInstall(selected, progressListener);
         }
       }
 
@@ -1374,7 +1371,7 @@ public void openLibraryManager(final String filterText, String dropdownItem) {
       contributionsSelfCheck.cancel();
     }
     @SuppressWarnings("serial")
-    LibraryManagerUI managerUI = new LibraryManagerUI(activeEditor, libraryInstaller) {
+    LibraryManagerUI managerUI = new LibraryManagerUI(activeEditor, BaseNoGui.getArduinoCoreService()) {
       @Override
       protected void onIndexesUpdated() throws Exception {
         BaseNoGui.initPackages();
diff --git a/arduino-core/src/cc/arduino/cli/ArduinoCoreInstance.java b/arduino-core/src/cc/arduino/cli/ArduinoCoreInstance.java
@@ -46,13 +46,18 @@
 import cc.arduino.cli.commands.Commands.UpdateLibrariesIndexResp;
 import cc.arduino.cli.commands.Common.DownloadProgress;
 import cc.arduino.cli.commands.Common.Instance;
+import cc.arduino.cli.commands.Common.TaskProgress;
 import cc.arduino.cli.commands.Compile.CompileReq;
 import cc.arduino.cli.commands.Compile.CompileResp;
 import cc.arduino.cli.commands.Lib.InstalledLibrary;
+import cc.arduino.cli.commands.Lib.LibraryInstallReq;
+import cc.arduino.cli.commands.Lib.LibraryInstallResp;
 import cc.arduino.cli.commands.Lib.LibraryListReq;
 import cc.arduino.cli.commands.Lib.LibraryListResp;
 import cc.arduino.cli.commands.Lib.LibrarySearchReq;
 import cc.arduino.cli.commands.Lib.LibrarySearchResp;
+import cc.arduino.cli.commands.Lib.LibraryUninstallReq;
+import cc.arduino.cli.commands.Lib.LibraryUninstallResp;
 import cc.arduino.cli.commands.Lib.SearchedLibrary;
 import cc.arduino.contributions.ProgressListener;
 import cc.arduino.contributions.libraries.ContributedLibraryRelease;
@@ -155,7 +160,8 @@ public List<SearchedLibrary> searchLibrary(String query)
     }
   }
 
-  public List<InstalledLibrary> libraryList(boolean listAll) throws StatusException {
+  public List<InstalledLibrary> libraryList(boolean listAll)
+      throws StatusException {
     try {
       LibraryListResp resp = stub.libraryList(LibraryListReq.newBuilder() //
           .setInstance(instance) //
@@ -171,4 +177,35 @@ public List<ContributedLibraryRelease> libraryResolveDependecies(ContributedLibr
     return new ArrayList<>();
   }
 
+  public void libraryInstall(ContributedLibraryRelease lib,
+                             ProgressListener progressListener) {
+    Iterator<LibraryInstallResp> stream = stub
+        .libraryInstall(LibraryInstallReq.newBuilder() //
+            .setInstance(instance) //
+            .setName(lib.getName()) //
+            .setVersion(lib.getVersion()) //
+            .build());
+    ProgressWrapper p = new ProgressWrapper(progressListener);
+    while (stream.hasNext()) {
+      LibraryInstallResp resp = stream.next();
+      DownloadProgress progress = resp.getProgress();
+      p.update(progress);
+    }
+  }
+
+  public void libraryRemove(ContributedLibraryRelease lib,
+                            ProgressListener progressListener) {
+    Iterator<LibraryUninstallResp> stream = stub
+        .libraryUninstall(LibraryUninstallReq.newBuilder() //
+            .setInstance(instance) //
+            .setName(lib.getName()) //
+            .setVersion(lib.getVersion()) //
+            .build());
+    ProgressWrapper p = new ProgressWrapper(progressListener);
+    while (stream.hasNext()) {
+      LibraryUninstallResp resp = stream.next();
+      TaskProgress progress = resp.getTaskProgress();
+      p.update(progress);
+    }
+  }
 }
diff --git a/arduino-core/src/cc/arduino/cli/ProgressWrapper.java b/arduino-core/src/cc/arduino/cli/ProgressWrapper.java
@@ -33,6 +33,7 @@
 import static processing.app.I18n.tr;
 
 import cc.arduino.cli.commands.Common.DownloadProgress;
+import cc.arduino.cli.commands.Common.TaskProgress;
 import cc.arduino.contributions.ProgressListener;
 import cc.arduino.utils.MultiStepProgress;
 import cc.arduino.utils.Progress;
@@ -78,4 +79,17 @@ public void update(DownloadProgress d) {
     }
     progressListener.onProgress(progress);
   }
+
+  String taskName;
+
+  public void update(TaskProgress t) {
+    String name = t.getName();
+    if (!name.isEmpty()) {
+      taskName = name;
+    }
+
+    progress.setProgress(t.getCompleted() ? 100 : 0);
+    progress.setStatus(taskName + " " + t.getMessage());
+    progressListener.onProgress(progress);
+  }
 }
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java b/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java
