diff options
| -rw-r--r-- | server/src/import.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/src/import.rs b/server/src/import.rs index ef58e09..ccf5274 100644 --- a/server/src/import.rs +++ b/server/src/import.rs @@ -6,7 +6,7 @@ use crate::{database::Database, federation::Federation, CONF}; use anyhow::{anyhow, bail, Context, Ok}; use async_recursion::async_recursion; -use futures::{stream::FuturesUnordered, StreamExt}; +use futures::{stream::FuturesUnordered, StreamExt, TryFutureExt}; use jellybase::cache_file; use jellyclient::Session; use jellycommon::{AssetLocation, MediaSource, Node, NodePrivate, RemoteImportOptions}; @@ -63,7 +63,7 @@ pub async fn import_path( let mut all: FuturesUnordered<_> = children_paths .into_iter() - .map(|p| import_path(p, db, fed, Some(identifier.clone()))) + .map(|p| import_path(p.clone(), db, fed, Some(identifier.clone())).map_err(|e| (p, e))) .collect(); let mut children_ids = Vec::new(); @@ -74,9 +74,9 @@ pub async fn import_path( errs += errs2; children_ids.extend(els) } - Err(e) => { + Err((p, e)) => { errs += 1; - error!("import failed: {e:?}") + error!("import of {p:?} failed: {e:?}") } } } |