handle canonicalization errors

feat/vaults
Tomáš Mládek 2020-09-20 19:40:36 +02:00
parent 967e3a3c7d
commit ec9b31292e
1 changed files with 7 additions and 1 deletions

View File

@ -298,7 +298,13 @@ fn _reimport_directory<T: AsRef<Path>>(pool: &DbPool, directory: T) -> Result<()
.into_iter()
.filter_map(|e| e.ok())
.filter(|e| e.path().is_file())
.filter_map(|e| fs::canonicalize(e.into_path()).ok()) // ???
.filter_map(|e| match fs::canonicalize(e.path()) {
Ok(_) => Some(e.into_path()),
Err(err) => {
error!("Could not canonicalize {}! {}", e.path().display(), err);
None
}
})
.collect();
let absolute_path = fs::canonicalize(&directory)?;