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

add back header fields

Browse source
This commit is contained in:
Quentin 2023-09-21 11:27:33 +02:00
parent b32bb6071a
commit 1fb9970502
Signed by: quentin
GPG key ID: E9602264D639FF68
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -844,7 +844,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]] [[package]]
name = "eml-codec" name = "eml-codec"
version = "0.1.2" version = "0.1.2"
source = "git+https://git.deuxfleurs.fr/Deuxfleurs/eml-codec.git?branch=main#5cff5510acc2c414b74419e0ee636d5ab249036b" source = "git+https://git.deuxfleurs.fr/Deuxfleurs/eml-codec.git?branch=main#a7bd3c475a58e42b86c163ec075ce01ddae7e60a"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.2",
"chrono", "chrono",

24
src/imap/mailbox_view.rs
View file

@ -18,6 +18,7 @@ use imap_codec::types::flag::{Flag, StoreResponse, StoreType};
use imap_codec::types::response::{Code, Data, MessageAttribute, Status}; use imap_codec::types::response::{Code, Data, MessageAttribute, Status};
use imap_codec::types::sequence::{self, SequenceSet}; use imap_codec::types::sequence::{self, SequenceSet};
use eml_codec::{ use eml_codec::{
header,
imf, imf,
part::{AnyPart, composite::Message}, part::{AnyPart, composite::Message},
mime::r#type::Deductible, mime::r#type::Deductible,
@ -889,8 +890,7 @@ fn get_message_section<'a>(
Some( Some(
FetchSection::HeaderFields(part, fields) | FetchSection::HeaderFieldsNot(part, fields), FetchSection::HeaderFields(part, fields) | FetchSection::HeaderFieldsNot(part, fields),
) => { ) => {
todo!(); let invert = matches!(section, Some(FetchSection::HeaderFieldsNot(_, _)));
/*let invert = matches!(section, Some(FetchSection::HeaderFieldsNot(_, _)));
let fields = fields let fields = fields
.iter() .iter()
.map(|x| match x { .map(|x| match x {
@ -900,26 +900,32 @@ fn get_message_section<'a>(
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
map_subpart_msg(
parsed, map_subpart(
parsed.child.as_ref(),
part.as_ref().map(|p| p.0.as_slice()).unwrap_or(&[]), part.as_ref().map(|p| p.0.as_slice()).unwrap_or(&[]),
|part_msg| { |part_msg| {
let mut ret = vec![]; let mut ret = vec![];
for (hn, hv) in part_msg.headers_raw() { for f in &part_msg.mime().kv {
let (k, v) = match f {
header::Field::Good(header::Kv2(k, v)) => (k, v),
_ => continue,
};
if fields if fields
.as_slice() .as_slice()
.iter() .iter()
.any(|x| (*x == hn.as_bytes()) ^ invert) .any(|x| (x == k) ^ invert)
{ {
ret.extend(hn.as_bytes()); ret.extend(*k);
ret.extend(b": "); ret.extend(b": ");
ret.extend(hv.as_bytes()); ret.extend(*v);
ret.extend(b"\r\n");
} }
} }
ret.extend(b"\r\n"); ret.extend(b"\r\n");
Ok(ret.into()) Ok(ret.into())
}, },
)*/ )
} }
Some(FetchSection::Part(part)) => map_subpart(parsed.child.as_ref(), part.0.as_slice(), |part| { Some(FetchSection::Part(part)) => map_subpart(parsed.child.as_ref(), part.0.as_slice(), |part| {
let bytes = match &part { let bytes = match &part {