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

WIP

Browse source
This commit is contained in:
Quentin 2023-09-28 11:57:46 +02:00
parent 1fb9970502
commit 2270aaa963
Signed by: quentin
GPG key ID: E9602264D639FF68
1 changed files with 123 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
src/imap/mailbox_view.rs
View file

@ -59,6 +59,96 @@ impl<'a> FetchedMail<'a> {
} }
} }
pub struct MailIdentifiers {
i: NonZeroU32,
uid: ImapUid,
uuid: UniqueIdent,
}
pub struct MailView<'a> {
ids: MailIdentifiers,
meta: MailMeta,
flags: Vec<Flag>,
content: FetchedMail<'a>,
}
pub struct AttributesProxy {
attrs: FetchAttributes
}
impl AttributeProxy {
fn new(attrs: &MacroOrFetchAttributes, is_uid_fetch: bool) -> Self {
// Expand macros
let mut fetch_attrs = match attributes {
MacroOrFetchAttributes::Macro(m) => m.expand(),
MacroOrFetchAttributes::FetchAttributes(a) => a.clone(),
};
// Handle uids
if *is_uid_fetch && !fetch_attrs.contains(&FetchAttribute::Uid) {
fetch_attrs.push(FetchAttribute::Uid);
}
Self { attrs: fetch_attrs }
}
fn need_body(&self) -> bool {
self.attrs.iter().any(|x| {
matches!(
x,
FetchAttribute::Body
| FetchAttribute::BodyExt { .. }
| FetchAttribute::Rfc822
| FetchAttribute::Rfc822Text
| FetchAttribute::BodyStructure
)
})
}
}
#[derive(Default)]
pub BatchMailViewBuilder<'a> struct {
attrs: AttributeProxy,
mi: Vec<MailIdentifiers>,
meta: Vec<MailMeta>,
flags: Vec<Vec<Flag>>,
bodies: Vec<FetchedMail<'a>>,
}
impl BatchMailViewBuilder<'a> {
fn new(req_attr: &MacroOrFetchAttributes) -> Self {
Self {
attrs: AttributeProxy::new(req_attr)
}
}
fn with_mail_identifiers(mut self, mi: Vec<MailIdentifiers>) -> Self {
self.mi = mi;
self
}
fn with_metadata(mut self, meta: Vec<MailMeta>) -> Self {
self.meta = meta;
self
}
fn with_flags(mut self, flags: Vec<Vec<Flag>>) -> Self {
self.flags = flags;
self
}
fn collect_bodies(mut self, FnOnce) -> Self {
if self.attrs.need_body() {
} else {
self.bodies =
}
self
}
fn build(self) -> Result<Vec<MailView>> {
}
}
/// A MailboxView is responsible for giving the client the information /// A MailboxView is responsible for giving the client the information
/// it needs about a mailbox, such as an initial summary of the mailbox's /// it needs about a mailbox, such as an initial summary of the mailbox's
/// content and continuous updates indicating when the content /// content and continuous updates indicating when the content
@ -252,32 +342,29 @@ impl MailboxView {
attributes: &MacroOrFetchAttributes, attributes: &MacroOrFetchAttributes,
is_uid_fetch: &bool, is_uid_fetch: &bool,
) -> Result<Vec<Body>> { ) -> Result<Vec<Body>> {
/*
let mails = self.get_mail_ids(sequence_set, *is_uid_fetch)?;
let mails_uuid = mails
.iter()
.map(|mi| mi.uuid)
.collect::<Vec<_>>();
let mails_meta = self.mailbox.fetch_meta(&mails_uuid).await?;
*/
// mail identifiers
let mails = self.get_mail_ids(sequence_set, *is_uid_fetch)?; let mails = self.get_mail_ids(sequence_set, *is_uid_fetch)?;
let mails_uuid = mails let mails_uuid = mails
.iter() .iter()
.map(|(_i, _uid, uuid)| *uuid) .map(|(_i, _uid, uuid)| *uuid)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
// mail metadata
let mails_meta = self.mailbox.fetch_meta(&mails_uuid).await?; let mails_meta = self.mailbox.fetch_meta(&mails_uuid).await?;
let mut fetch_attrs = match attributes { // fectch email body and transform to a state usable by select
MacroOrFetchAttributes::Macro(m) => m.expand(),
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| {
matches!(
x,
FetchAttribute::Body
| FetchAttribute::BodyExt { .. }
| FetchAttribute::Rfc822
| FetchAttribute::Rfc822Text
| FetchAttribute::BodyStructure
)
});
let mails = if need_body { let mails = if need_body {
let mut iter = mails let mut iter = mails
.into_iter() .into_iter()
@ -300,16 +387,16 @@ impl MailboxView {
.collect::<Vec<_>>() .collect::<Vec<_>>()
}; };
let mut ret = vec![]; // add flags
for (i, uid, uuid, meta, body) in mails { let mails = mails.into_iter().filter_map(|(i, uid, uuid, meta, body)|
let mut attributes = vec![]; self
let (_uid2, flags) = self
.known_state .known_state
.table .table
.get(&uuid) .get(&uuid)
.ok_or_else(|| anyhow!("Mail not in uidindex table: {}", uuid))?; .map(|(_uid2, flags)| (i, uid, uuid, meta, flags, body)))
.collect::<Vec<_>>();
// parse email body / headers
let fetched = match &body { let fetched = match &body {
Some(m) => { Some(m) => {
FetchedMail::Full(eml_codec::parse_message(m).or(Err(anyhow!("Invalid mail body")))?.1) FetchedMail::Full(eml_codec::parse_message(m).or(Err(anyhow!("Invalid mail body")))?.1)
@ -319,6 +406,16 @@ impl MailboxView {
} }
}; };
// do the logic
select_mail_fragments(fetch_attrs, mails)
}
todo!();
let mut ret = vec![];
for (i, uid, uuid, meta, flags, body) in mails {
let mut attributes = vec![];
for attr in fetch_attrs.iter() { for attr in fetch_attrs.iter() {
match attr { match attr {
FetchAttribute::Uid => attributes.push(MessageAttribute::Uid(uid)), FetchAttribute::Uid => attributes.push(MessageAttribute::Uid(uid)),
@ -433,8 +530,8 @@ impl MailboxView {
// ---- // ----
// Gets the UIDs and UUIDs of mails identified by a SequenceSet of // Gets the IMAP ID, the IMAP UIDs and, the Aerogramme UUIDs of mails identified by a SequenceSet of
// sequence numbers // sequence numbers (~ IMAP selector)
fn get_mail_ids( fn get_mail_ids(
&self, &self,
sequence_set: &SequenceSet, sequence_set: &SequenceSet,