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

[yabridgectl] Don't skip over broken symlinks

Browse Source
This commit is contained in:
Robbert van der Helm
2022-04-18 12:58:42 +02:00
parent 8abb960813
commit 4e2f72d67a
3 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/src/files.rs
+19 -11
View File
@@ -411,9 +411,7 @@ pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
let mut dll_files: Vec<(PathBuf, Option<PathBuf>)> = Vec::new();
let mut vst3_files: Vec<(PathBuf, Option<PathBuf>)> = Vec::new();
let mut so_files: Vec<NativeFile> = Vec::new();
// XXX: We're silently skipping directories and files we don't have permission to read. This
// sounds like the expected behavior, but I"m not entirely sure.
for (file_idx, entry) in WalkDir::new(directory)
for (file_idx, path) in WalkDir::new(directory)
.follow_links(true)
.into_iter()
.filter_entry(|e| {
@@ -424,8 +422,20 @@ pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
.map(|p| !blacklist.contains(p.as_path()))
.unwrap_or(false)
})
.filter_map(|e| e.ok())
.filter(|e| !e.file_type().is_dir())
.filter_map(|e| {
// NOTE: Broken symlinks will also get an `Err` entry, so we'll use `err.path()` to
// still include them in the index
let path = match e {
Ok(entry) => entry.path().to_owned(),
Err(err) => err.path()?.to_owned(),
};
if !path.is_dir() {
Some(path)
} else {
None
}
})
.enumerate()
{
// This is a bit of an odd warning, but I can see it happening that someone adds their
@@ -439,9 +449,8 @@ pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
)
}
match entry.path().extension().and_then(|os| os.to_str()) {
match path.extension().and_then(|os| os.to_str()) {
Some("dll") => {
let path = entry.into_path();
let subdirectory = path
.parent()
.and_then(|p| p.strip_prefix(directory).ok())
@@ -449,7 +458,6 @@ pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
dll_files.push((path, subdirectory));
}
Some("vst3") => {
let path = entry.into_path();
let subdirectory = path
.parent()
.and_then(|p| p.strip_prefix(directory).ok())
@@ -457,10 +465,10 @@ pub fn index(directory: &Path, blacklist: &HashSet<&Path>) -> SearchIndex {
vst3_files.push((path, subdirectory));
}
Some("so") => {
if entry.path_is_symlink() {
so_files.push(NativeFile::Symlink(entry.into_path()));
if path.is_symlink() {
so_files.push(NativeFile::Symlink(path));
} else {
so_files.push(NativeFile::Regular(entry.into_path()));
so_files.push(NativeFile::Regular(path));
}
}
_ => (),