diff options
| -rw-r--r-- | lib/domain/libimagmail/src/mailtree.rs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/domain/libimagmail/src/mailtree.rs b/lib/domain/libimagmail/src/mailtree.rs index dff4ed58..4eaec410 100644 --- a/lib/domain/libimagmail/src/mailtree.rs +++ b/lib/domain/libimagmail/src/mailtree.rs @@ -17,6 +17,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // +use std::path::PathBuf; + use failure::Fallible as Result; use failure::ResultExt; use indextree::Arena; @@ -24,10 +26,13 @@ use indextree::NodeId; use indextree::Node; use itertools::Itertools; +use libimagstore::storeid::StoreId; + use crate::store::MailStoreWithConnection; use crate::mail::Mail; use crate::mail::LoadedMail; + #[derive(Debug)] pub struct Mailtree { arena: Arena<String>, @@ -101,6 +106,15 @@ fn fill_arena_with<'a>(arena: &mut Arena<String>, store: &'a MailStoreWithConnec .into_iter() .map(|id: String| { trace!("Trying to get: {:?}", id); + + { + let sid = StoreId::new(PathBuf::from(id.clone()))?; + if store.is_borrowed(sid)? { + trace!("Entry is already borrowed, returning"); + return Ok(()) + } + } + let mail = store.get_mail_by_id(&id) .context("Getting mail by id")? .ok_or_else(|| format_err!("Cannot find mail for id {}", id))?; |