vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-06 19:40:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

[yabridgectl] Gracefully catch bundle subdir error

Browse Source 
This could only occur if people go out of their way to do weird things
and add the `x86_64-win` directory inside of a VST3 bundle to their
plugin locations. But somehow people still manage to do just that.....
This commit is contained in:
Robbert van der Helm
2022-06-12 23:56:39 +02:00
parent 67747531cc
commit a282bdc9d1
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/src/files.rs
+15 -12
View File
@@ -599,18 +599,21 @@ impl SearchIndex {
// 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()
subdirectory.and_then(|subdirectory| {
// NOTE: Just `.uwnrapping()` all of these and using `.map()`
// instead of `.and_then()` should be sufficient, but for some
// reason people add the `x86_64-win` directory inside of a
// VST3 bundle to their plugin locations........why?
Some(
subdirectory
// x86_64-win
.parent()?
// Contents
.parent()?
// foo.vst3
.parent()?
.to_owned(),
)
}),
)
} else {