LibraryInstaller now autodetects if a library is being replaced

It's no more required to pass this information from outside,
just library that is being installed is now sufficient.

Author: cmaglie

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

@@ -84,7 +84,7 @@ protected void onInstall(ContributedLibrary selectedLibrary, ContributedLibrary
         if (selectedLibrary.isReadOnly()) {
           onRemovePressed(installedLibrary);
         } else {
-          onInstallPressed(selectedLibrary, installedLibrary);
+          onInstallPressed(selectedLibrary);
         }
       }
 
@@ -219,12 +219,12 @@ protected void onUpdatePressed() {
     installerThread.start();
   }
 
-  public void onInstallPressed(final ContributedLibrary lib, final ContributedLibrary replaced) {
+  public void onInstallPressed(final ContributedLibrary lib) {
     clearErrorMessage();
     installerThread = new Thread(() -> {
       try {
         setProgressVisible(true, tr("Installing..."));
-        installer.install(lib, replaced, this::setProgress);
+        installer.install(lib, this::setProgress);
         onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element
         //getContribModel().updateLibrary(lib);
       } catch (Exception e) {

app/src/processing/app/Base.java

@@ -362,7 +362,7 @@ public Base(String[] args) throws Exception {
         if (selected.isReadOnly()) {
           libraryInstaller.remove(installed, progressListener);
         } else {
-          libraryInstaller.install(selected, installed, progressListener);
+          libraryInstaller.install(selected, progressListener);
         }
       }
 

arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java

@@ -82,22 +82,35 @@ public synchronized void updateIndex(ProgressListener progressListener) throws E
     rescanLibraryIndex(progress, progressListener);
   }
 
-  public synchronized void install(ContributedLibrary lib, ContributedLibrary replacedLib, ProgressListener progressListener) throws Exception {
+  public synchronized void install(ContributedLibrary lib, ProgressListener progressListener) throws Exception {
     final MultiStepProgress progress = new MultiStepProgress(4);
 
     // Do install library (3 steps)
-    performInstall(lib, replacedLib, progressListener, progress);
+    performInstall(lib, progressListener, progress);
 
     // Rescan index (1 step)
     rescanLibraryIndex(progress, progressListener);
   }
 
-  private void performInstall(ContributedLibrary lib, ContributedLibrary replacedLib, ProgressListener progressListener, MultiStepProgress progress) throws Exception {
+  private void performInstall(ContributedLibrary lib, ProgressListener progressListener, MultiStepProgress progress) throws Exception {
     if (lib.isInstalled()) {
       System.out.println(I18n.format(tr("Library is already installed: {0} version {1}"), lib.getName(), lib.getParsedVersion()));
       return;
     }
 
+    File libsFolder = BaseNoGui.librariesIndexer.getSketchbookLibrariesFolder();
+    File destFolder = new File(libsFolder, lib.getName().replaceAll(" ", "_"));
+
+    // Check if we are replacing an already installed lib
+    ContributedLibrary replacedLib = null;
+    LibrariesIndex index = BaseNoGui.librariesIndexer.getIndex();
+    for (ContributedLibrary l : index.find(lib.getName())) {
+      if (l.isInstalled() && l.getInstalledFolder().equals(destFolder)) {
+        replacedLib = l;
+        break;
+      }
+    }
+
     DownloadableContributionsDownloader downloader = new DownloadableContributionsDownloader(BaseNoGui.librariesIndexer.getStagingFolder());
 
     // Step 1: Download library
@@ -116,7 +129,6 @@ private void performInstall(ContributedLibrary lib, ContributedLibrary replacedL
     // Step 2: Unpack library on the correct location
     progress.setStatus(I18n.format(tr("Installing library: {0}"), lib.getName()));
     progressListener.onProgress(progress);
-    File libsFolder = BaseNoGui.librariesIndexer.getSketchbookLibrariesFolder();
     File tmpFolder = FileUtils.createTempFolder(libsFolder);
     try {
       new ArchiveExtractor(platform).extract(lib.getDownloadedFile(), tmpFolder, 1);
@@ -129,7 +141,6 @@ private void performInstall(ContributedLibrary lib, ContributedLibrary replacedL
     // Step 3: Remove replaced library and move installed one to the correct location
     // TODO: Fix progress bar...
     remove(replacedLib, progressListener);
-    File destFolder = new File(libsFolder, lib.getName().replaceAll(" ", "_"));
     tmpFolder.renameTo(destFolder);
     progress.stepDone();
   }