mredaelli
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

melib: detect plain text in multipart/alternative

embed
Manos Pitsidianakis 2019-05-09 12:28:13 +03:00
parent 8b23ddb920
commit dad7c09158
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -18,7 +18,7 @@ ui = { path = "ui", version = "*" }
[profile.release]
lto = true
#debug = true
debug = true
[workspace]
members = ["melib", "ui"]

22
melib/src/mailbox/email/attachments.rs
View File

@ -369,6 +369,24 @@ impl Attachment {
ContentType::Text {
kind: Text::Html, ..
} => true,
ContentType::Text {
kind: Text::Plain, ..
} => false,
ContentType::Multipart {
kind: MultipartType::Alternative,
ref subattachments,
..
} => {
for a in subattachments.iter() {
if let ContentType::Text {
kind: Text::Plain, ..
} = a.content_type
{
return false;
}
}
return true;
}
ContentType::Multipart {
ref subattachments, ..
} => subattachments
@ -380,6 +398,10 @@ impl Attachment {
ContentType::Text {
kind: Text::Html, ..
} => acc,
ContentType::Multipart {
kind: MultipartType::Alternative,
..
} => a.is_html(),
_ => acc,
}),
_ => false,