From ae73df2b1745e89d4724545a713da4c89b0402a4 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Sat, 11 Jun 2022 14:49:16 +0200
Subject: [PATCH] [yabridgectl] Fix subdirectory detect for bundles

---
 CHANGELOG.md                   |  6 ++++++
 tools/yabridgectl/src/files.rs | 29 ++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34547236..9749cbd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,12 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Added a `system-asio` build option to aid distro packaging.
 
+### yabridgectl
+
+- Fixed a regression from yabridge 4.0.0 where VST3 plugins in the 'new' bundle
+  format, like _Sforzando_, were not set up correctly due to the subdirectory
+  detection logic change from the previous release.
+
 ### Packaging notes
 
 - The new `system-asio` build option forces asio to be used from the standard
diff --git a/tools/yabridgectl/src/files.rs b/tools/yabridgectl/src/files.rs
index f35d104e..25c2a783 100644
--- a/tools/yabridgectl/src/files.rs
+++ b/tools/yabridgectl/src/files.rs
@@ -430,6 +430,9 @@ impl SearchResults {
 /// to actual VST2 plugins and VST3 modules using `search()`. Any path found in the blacklist will
 /// be pruned immediately, so this can be used to both not index individual files and to skip an
 /// entire directory.
+///
+/// For VST3 plugin _bundles_ the subdirectory also contains the `foo.vst3/Contents/x86_64-win`
+/// suffix. This needs to be stripped out to get the bundle root.
 pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
     // These are pairs of `(absolute_path, subdirectory)`. The subdirectory is used for setting up
     // VST3 plugins and for setting up VST2 plugins in the centralized installation location mode.
@@ -483,6 +486,8 @@ pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
                 dll_files.push((path, subdirectory));
             }
             Some("vst3") => {
+                // NOTE: For bundles this will also contain the `foo.vst3/Contents/x86_64-win`
+                //       suffix. This needs to be stripped later.
                 let subdirectory = path
                     .parent()
                     .and_then(|p| p.strip_prefix(directory).ok())
@@ -588,10 +593,28 @@ impl SearchIndex {
                         })
                         .unwrap_or(false);
 
-                    let module = if module_is_in_bundle {
-                        Vst3ModuleType::Bundle(bundle_root.unwrap().to_owned())
+                    let (module, subdirectory) = if module_is_in_bundle {
+                        (
+                            Vst3ModuleType::Bundle(bundle_root.unwrap().to_owned()),
+                            // The subdirectory should be relative to the bundle, not to the .vst3
+                            // file inside of the bundle. The latter is what we get from the index
+                            // function since it only considers regular files and symlinks.
+                            subdirectory.map(|subdirectory| {
+                                subdirectory
+                                    // x86_64-win
+                                    .parent()
+                                    .unwrap()
+                                    // Contents
+                                    .parent()
+                                    .unwrap()
+                                    // foo.vst3
+                                    .parent()
+                                    .unwrap()
+                                    .to_owned()
+                            }),
+                        )
                     } else {
-                        Vst3ModuleType::Legacy(module_path)
+                        (Vst3ModuleType::Legacy(module_path), subdirectory)
                     };
 
                     Ok(Ok(Vst3Module {