fix(#424): resolve plugin scan directory during a scoped scan

Author: DropSnorz

owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java

@@ -20,6 +20,7 @@
 
 import com.owlplug.core.components.ApplicationPreferences;
 import com.owlplug.core.ui.SVGPaths;
+import com.owlplug.core.utils.FileUtils;
 import com.owlplug.plugin.controllers.dialogs.ListDirectoryDialogController;
 import java.io.File;
 import java.io.IOException;
@@ -123,7 +124,7 @@ public void init() {
     });
 
     directoryTextField.textProperty().addListener((observable, oldValue, newValue) -> {
-      prefs.put(directoryOptionKey, newValue);
+      prefs.put(directoryOptionKey, FileUtils.convertPath(newValue));
       refresh();
     });
 

owlplug-client/src/main/java/com/owlplug/plugin/tasks/discovery/ScopedScanEntityCollector.java

@@ -22,6 +22,9 @@
 import com.owlplug.plugin.model.PluginFormat;
 import com.owlplug.plugin.model.Symlink;
 import com.owlplug.plugin.tasks.discovery.fileformats.PluginFile;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -66,6 +69,15 @@ public ScopedScanEntityCollector collect() {
 
       collectedSymlinks.addAll(symlinkCollector.collect(parameters.getDirectoryScope()));
 
+      // Try to restore original scan directory when a directory scope is used
+      // https://github.com/DropSnorz/OwlPlug/issues/424
+      String scanPath = getScanPathFromDirectoryScope(parameters.getDirectoryScope());
+      if (scanPath != null) {
+        File scanFile = new File(getScanPathFromDirectoryScope(scanPath));
+        collectedPluginFiles.forEach(f -> f.setScanDirectory(scanFile));
+      }
+
+
     } else {
       // Plugins are retrieved from regulars directories
       String vst2Directory = parameters.getVst2Directory();
@@ -123,4 +135,38 @@ public Set<Symlink> getSymlinks() {
     return symlinks;
   }
 
+  private Set<String> getAllPluginScanPath() {
+    Set<String> paths = new HashSet<String>();
+
+    paths.add(parameters.getVst2Directory());
+    paths.add(parameters.getVst3Directory());
+    paths.add(parameters.getAuDirectory());
+    paths.add(parameters.getLv2Directory());
+
+    paths.addAll(parameters.getVst2ExtraDirectories());
+    paths.addAll(parameters.getVst3ExtraDirectories());
+    paths.addAll(parameters.getAuExtraDirectories());
+    paths.addAll(parameters.getLv2ExtraDirectories());
+
+    // Clean blank paths if some are provided
+    paths.removeIf(String::isBlank);
+
+    return paths;
+
+  }
+
+  /**
+   * Compute original scan directory based on the provided directory scope.
+   * See related <a href="https://github.com/DropSnorz/OwlPlug/issues/424">issue</a>
+   * @param directoryScope the directory scope
+   * @return path to the potential scan directory
+   */
+  private String getScanPathFromDirectoryScope(String directoryScope) {
+    return getAllPluginScanPath()
+               .stream()
+               .sorted()
+               .filter(s -> directoryScope.contains(s))
+               .findFirst().orElse(null);
+  }
+
 }