meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

melib/maildir: make MaildirOp return Result<PathBuf>

jmap-eventsource
Manos Pitsidianakis 2020-11-09 03:36:40 +02:00
parent a34f0aac5b
commit f0800f38a8
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
melib/src/backends/maildir.rs
View File

@ -67,7 +67,7 @@ impl MaildirOp {
slice: None, slice: None,
} }
} }
fn path(&self) -> PathBuf { fn path(&self) -> Result<PathBuf> {
let map = self.hash_index.lock().unwrap(); let map = self.hash_index.lock().unwrap();
let map = &map[&self.mailbox_hash]; let map = &map[&self.mailbox_hash];
debug!("looking for {} in {} map", self.hash, self.mailbox_hash); debug!("looking for {} in {} map", self.hash, self.mailbox_hash);
@ -76,15 +76,17 @@ impl MaildirOp {
for e in map.iter() { for e in map.iter() {
debug!("{:#?}", e); debug!("{:#?}", e);
} }
return Err(MeliError::new("File not found"));
} }
if let Some(modif) = &map[&self.hash].modified {
Ok(if let Some(modif) = &map[&self.hash].modified {
match modif { match modif {
PathMod::Path(ref path) => path.clone(), PathMod::Path(ref path) => path.clone(),
PathMod::Hash(hash) => map[&hash].to_path_buf(), PathMod::Hash(hash) => map[&hash].to_path_buf(),
} }
} else { } else {
map.get(&self.hash).unwrap().to_path_buf() map.get(&self.hash).unwrap().to_path_buf()
} })
} }
} }
@ -94,7 +96,7 @@ impl<'a> BackendOp for MaildirOp {
let file = std::fs::OpenOptions::new() let file = std::fs::OpenOptions::new()
.read(true) .read(true)
.write(false) .write(false)
.open(&self.path())?; .open(&self.path()?)?;
let mut buf_reader = BufReader::new(file); let mut buf_reader = BufReader::new(file);
let mut contents = Vec::new(); let mut contents = Vec::new();
buf_reader.read_to_end(&mut contents)?; buf_reader.read_to_end(&mut contents)?;
@ -105,7 +107,7 @@ impl<'a> BackendOp for MaildirOp {
} }
fn fetch_flags(&self) -> ResultFuture<Flag> { fn fetch_flags(&self) -> ResultFuture<Flag> {
let path = self.path(); let path = self.path()?;
let ret = Ok(path.flags()); let ret = Ok(path.flags());
Ok(Box::pin(async move { ret })) Ok(Box::pin(async move { ret }))
} }