Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 5 Wiki Activity

Correctly implement UID FETCH and UID STORE

Browse source
This commit is contained in:
Alex 2022-07-13 15:00:13 +02:00
parent cd59be3a00
commit 15a354f949
Signed by: lx
GPG key ID: 0E496D15096376BE
1 changed files with 46 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/imap/mailbox_view.rs
View file

@ -148,17 +148,13 @@ impl MailboxView {
kind: &StoreType, kind: &StoreType,
_response: &StoreResponse, _response: &StoreResponse,
flags: &[Flag], flags: &[Flag],
uid: &bool, is_uid_store: &bool,
) -> Result<Vec<Body>> { ) -> Result<Vec<Body>> {
self.mailbox.opportunistic_sync().await?; self.mailbox.opportunistic_sync().await?;
if *uid {
bail!("UID STORE not implemented");
}
let flags = flags.iter().map(|x| x.to_string()).collect::<Vec<_>>(); let flags = flags.iter().map(|x| x.to_string()).collect::<Vec<_>>();
let mails = self.get_mail_ids(sequence_set)?; let mails = self.get_mail_ids(sequence_set, *is_uid_store)?;
for (_i, _uid, uuid) in mails.iter() { for (_i, _uid, uuid) in mails.iter() {
match kind { match kind {
StoreType::Add => { StoreType::Add => {
@ -200,13 +196,9 @@ impl MailboxView {
&self, &self,
sequence_set: &SequenceSet, sequence_set: &SequenceSet,
attributes: &MacroOrFetchAttributes, attributes: &MacroOrFetchAttributes,
uid: &bool, is_uid_fetch: &bool,
) -> Result<Vec<Body>> { ) -> Result<Vec<Body>> {
if *uid { let mails = self.get_mail_ids(sequence_set, *is_uid_fetch)?;
bail!("UID FETCH not implemented");
}
let mails = self.get_mail_ids(sequence_set)?;
let mails_uuid = mails let mails_uuid = mails
.iter() .iter()
@ -214,10 +206,13 @@ impl MailboxView {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mails_meta = self.mailbox.fetch_meta(&mails_uuid).await?; let mails_meta = self.mailbox.fetch_meta(&mails_uuid).await?;
let fetch_attrs = match attributes { let mut fetch_attrs = match attributes {
MacroOrFetchAttributes::Macro(m) => m.expand(), MacroOrFetchAttributes::Macro(m) => m.expand(),
MacroOrFetchAttributes::FetchAttributes(a) => a.clone(), MacroOrFetchAttributes::FetchAttributes(a) => a.clone(),
}; };
if *is_uid_fetch && !fetch_attrs.contains(&FetchAttribute::Uid) {
fetch_attrs.push(FetchAttribute::Uid);
}
let need_body = fetch_attrs.iter().any(|x| { let need_body = fetch_attrs.iter().any(|x| {
matches!( matches!(
x, x,
@ -352,6 +347,7 @@ impl MailboxView {
fn get_mail_ids( fn get_mail_ids(
&self, &self,
sequence_set: &SequenceSet, sequence_set: &SequenceSet,
by_uid: bool,
) -> Result<Vec<(NonZeroU32, ImapUid, UniqueIdent)>> { ) -> Result<Vec<(NonZeroU32, ImapUid, UniqueIdent)>> {
let mail_vec = self let mail_vec = self
.known_state .known_state
@ -361,14 +357,43 @@ impl MailboxView {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mut mails = vec![]; let mut mails = vec![];
let iter_strat = sequence::Strategy::Naive {
largest: NonZeroU32::try_from((self.known_state.idx_by_uid.len() + 1) as u32).unwrap(), if by_uid {
}; if mail_vec.is_empty() {
for i in sequence_set.iter(iter_strat) { return Ok(vec![]);
if let Some(mail) = mail_vec.get(i.get() as usize - 1) { }
mails.push((i, mail.0, mail.1)); let iter_strat = sequence::Strategy::Naive {
} else { largest: mail_vec.last().unwrap().0,
bail!("No such mail: {}", i); };
let mut i = 0;
for uid in sequence_set.iter(iter_strat) {
while mail_vec.get(i).map(|mail| mail.0 < uid).unwrap_or(false) {
i += 1;
}
if let Some(mail) = mail_vec.get(i) {
if mail.0 == uid {
mails.push((NonZeroU32::try_from(i as u32 + 1).unwrap(), mail.0, mail.1));
}
} else {
break;
}
}
} else {
if mail_vec.is_empty() {
bail!("No such message (mailbox is empty)");
}
let iter_strat = sequence::Strategy::Naive {
largest: NonZeroU32::try_from((mail_vec.len()) as u32).unwrap(),
};
for i in sequence_set.iter(iter_strat) {
if let Some(mail) = mail_vec.get(i.get() as usize - 1) {
mails.push((i, mail.0, mail.1));
} else {
bail!("No such mail: {}", i);
}
} }
} }