Skip superfluous syscall
This commit is contained in:
parent
7625449434
commit
2a1c93c462
1 changed files with 16 additions and 4 deletions
|
@ -419,22 +419,34 @@ fn process_directory<P: AsRef<Path>, Q: AsRef<Path>>(
|
||||||
let mut artwork_file = None;
|
let mut artwork_file = None;
|
||||||
|
|
||||||
for entry in read_dir {
|
for entry in read_dir {
|
||||||
let name = match entry {
|
let entry = match entry {
|
||||||
Ok(ref f) => f.file_name(),
|
Ok(e) => e,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!(
|
error!(
|
||||||
"File read error within `{}`: {}",
|
"File read error within `{}`: {}",
|
||||||
real_path.as_ref().display(),
|
real_path.as_ref().display(),
|
||||||
e
|
e
|
||||||
);
|
);
|
||||||
break;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let is_dir = match entry.file_type().map(|f| f.is_dir()) {
|
||||||
|
Ok(d) => d,
|
||||||
|
Err(e) => {
|
||||||
|
error!(
|
||||||
|
"Could not determine file type for `{}`: {}",
|
||||||
|
entry.path().to_string_lossy(),
|
||||||
|
e
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let name = entry.file_name();
|
||||||
let entry_real_path = real_path.as_ref().join(&name);
|
let entry_real_path = real_path.as_ref().join(&name);
|
||||||
let entry_virtual_path = virtual_path.as_ref().join(&name);
|
let entry_virtual_path = virtual_path.as_ref().join(&name);
|
||||||
|
|
||||||
if entry_real_path.is_dir() {
|
if is_dir {
|
||||||
scope.spawn({
|
scope.spawn({
|
||||||
let directories_output = directories_output.clone();
|
let directories_output = directories_output.clone();
|
||||||
let songs_output = songs_output.clone();
|
let songs_output = songs_output.clone();
|
||||||
|
|
Loading…
Add table
Reference in a new issue