From 7b55b9ecb44793304b503db64a07e5da79a37914 Mon Sep 17 00:00:00 2001 From: c Date: Tue, 4 Feb 2025 10:12:52 +0100 Subject: [PATCH 1/7] Switch if-else branches --- src/parsers/message.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parsers/message.rs b/src/parsers/message.rs index 926edd9f..4d4b164d 100644 --- a/src/parsers/message.rs +++ b/src/parsers/message.rs @@ -346,10 +346,10 @@ impl MessageParser { } else { message.attachments.push(message.parts.len()); - if !is_inline { - PartType::Binary(bytes) - } else { + if is_inline { PartType::InlineBinary(bytes) + } else { + PartType::Binary(bytes) } } } else { From 68b9739547565a96a5e2e58eeb0fca7cb1a0b98a Mon Sep 17 00:00:00 2001 From: c Date: Tue, 4 Feb 2025 13:52:41 +0100 Subject: [PATCH 2/7] Lift condition for attachments out of the if-else --- src/parsers/message.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/parsers/message.rs b/src/parsers/message.rs index 4d4b164d..14bce72f 100644 --- a/src/parsers/message.rs +++ b/src/parsers/message.rs @@ -314,6 +314,12 @@ impl MessageParser { message.text_body.push(message.parts.len()); } + let is_html = mime_type == MimeType::TextHtml; + + if !is_text || is_text && (!add_to_html && is_html || !add_to_text && !is_html) { + message.attachments.push(message.parts.len()); + } + if is_text { let text = match ( bytes, @@ -332,20 +338,12 @@ impl MessageParser { (Cow::Borrowed(bytes), None) => String::from_utf8_lossy(bytes), }; - let is_html = mime_type == MimeType::TextHtml; - - if !add_to_html && is_html || !add_to_text && !is_html { - message.attachments.push(message.parts.len()); - } - if is_html { PartType::Html(text) } else { PartType::Text(text) } } else { - message.attachments.push(message.parts.len()); - if is_inline { PartType::InlineBinary(bytes) } else { From c560bb1683604507adff2793d2b694725f845b64 Mon Sep 17 00:00:00 2001 From: c Date: Mon, 3 Feb 2025 18:15:20 +0100 Subject: [PATCH 3/7] Simplify expression: (A || !A && B) == (A || B) --- src/parsers/message.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parsers/message.rs b/src/parsers/message.rs index 14bce72f..6ff3dc0e 100644 --- a/src/parsers/message.rs +++ b/src/parsers/message.rs @@ -316,7 +316,7 @@ impl MessageParser { let is_html = mime_type == MimeType::TextHtml; - if !is_text || is_text && (!add_to_html && is_html || !add_to_text && !is_html) { + if !is_text || !add_to_html && is_html || !add_to_text && !is_html { message.attachments.push(message.parts.len()); } From 026e09b94605911d8ed945730e69ebb2537ce132 Mon Sep 17 00:00:00 2001 From: c Date: Tue, 4 Feb 2025 14:09:30 +0100 Subject: [PATCH 4/7] clippy --- src/parsers/message.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/parsers/message.rs b/src/parsers/message.rs index 6ff3dc0e..05bd9dd2 100644 --- a/src/parsers/message.rs +++ b/src/parsers/message.rs @@ -343,12 +343,10 @@ impl MessageParser { } else { PartType::Text(text) } + } else if is_inline { + PartType::InlineBinary(bytes) } else { - if is_inline { - PartType::InlineBinary(bytes) - } else { - PartType::Binary(bytes) - } + PartType::Binary(bytes) } } else { message.attachments.push(message.parts.len()); From 6a87f0b63b65bde4c3a644c3f4f9f26fa24b2a7c Mon Sep 17 00:00:00 2001 From: c Date: Thu, 5 Dec 2024 13:50:34 +0100 Subject: [PATCH 5/7] fix: related multipart image/*, audio/*, video/* inline attachments should be InlineBinary --- resources/eml/legacy/015.crlf.json | 4 ++-- resources/eml/legacy/015.json | 4 ++-- resources/eml/legacy/018.crlf.json | 4 ++-- resources/eml/legacy/018.json | 4 ++-- resources/eml/legacy/024.crlf.json | 4 ++-- resources/eml/legacy/024.json | 4 ++-- resources/eml/legacy/025.crlf.json | 4 ++-- resources/eml/legacy/025.json | 4 ++-- resources/eml/legacy/035.crlf.json | 4 ++-- resources/eml/legacy/035.json | 4 ++-- resources/eml/legacy/039.crlf.json | 4 ++-- resources/eml/legacy/039.json | 4 ++-- resources/eml/legacy/050.crlf.json | 4 ++-- resources/eml/legacy/050.json | 4 ++-- resources/eml/legacy/051.crlf.json | 4 ++-- resources/eml/legacy/051.json | 4 ++-- resources/eml/thirdparty/011.crlf.json | 2 +- resources/eml/thirdparty/011.json | 2 +- src/parsers/message.rs | 10 +++++++++- 19 files changed, 43 insertions(+), 35 deletions(-) diff --git a/resources/eml/legacy/015.crlf.json b/resources/eml/legacy/015.crlf.json index ccf865dd..6737c56a 100644 --- a/resources/eml/legacy/015.crlf.json +++ b/resources/eml/legacy/015.crlf.json @@ -360,7 +360,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1751,7 +1751,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/015.json b/resources/eml/legacy/015.json index ccf865dd..6737c56a 100644 --- a/resources/eml/legacy/015.json +++ b/resources/eml/legacy/015.json @@ -360,7 +360,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1751,7 +1751,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/018.crlf.json b/resources/eml/legacy/018.crlf.json index 1a81b42a..da36f888 100644 --- a/resources/eml/legacy/018.crlf.json +++ b/resources/eml/legacy/018.crlf.json @@ -325,7 +325,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1716,7 +1716,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/018.json b/resources/eml/legacy/018.json index 1a81b42a..da36f888 100644 --- a/resources/eml/legacy/018.json +++ b/resources/eml/legacy/018.json @@ -325,7 +325,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1716,7 +1716,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/024.crlf.json b/resources/eml/legacy/024.crlf.json index 58eab6ba..33cf248e 100644 --- a/resources/eml/legacy/024.crlf.json +++ b/resources/eml/legacy/024.crlf.json @@ -255,7 +255,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1646,7 +1646,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/024.json b/resources/eml/legacy/024.json index 58eab6ba..33cf248e 100644 --- a/resources/eml/legacy/024.json +++ b/resources/eml/legacy/024.json @@ -255,7 +255,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1646,7 +1646,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/025.crlf.json b/resources/eml/legacy/025.crlf.json index 2d76d283..be63cbc8 100644 --- a/resources/eml/legacy/025.crlf.json +++ b/resources/eml/legacy/025.crlf.json @@ -290,7 +290,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1681,7 +1681,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/025.json b/resources/eml/legacy/025.json index 2d76d283..be63cbc8 100644 --- a/resources/eml/legacy/025.json +++ b/resources/eml/legacy/025.json @@ -290,7 +290,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1681,7 +1681,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/035.crlf.json b/resources/eml/legacy/035.crlf.json index 02ee5a4f..9a81e470 100644 --- a/resources/eml/legacy/035.crlf.json +++ b/resources/eml/legacy/035.crlf.json @@ -344,7 +344,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1730,7 +1730,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/035.json b/resources/eml/legacy/035.json index 02ee5a4f..9a81e470 100644 --- a/resources/eml/legacy/035.json +++ b/resources/eml/legacy/035.json @@ -344,7 +344,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1730,7 +1730,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/039.crlf.json b/resources/eml/legacy/039.crlf.json index f6763224..57fb0d32 100644 --- a/resources/eml/legacy/039.crlf.json +++ b/resources/eml/legacy/039.crlf.json @@ -274,7 +274,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1660,7 +1660,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/039.json b/resources/eml/legacy/039.json index f6763224..57fb0d32 100644 --- a/resources/eml/legacy/039.json +++ b/resources/eml/legacy/039.json @@ -274,7 +274,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1660,7 +1660,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/050.crlf.json b/resources/eml/legacy/050.crlf.json index ad2d7d1b..b7acd92c 100644 --- a/resources/eml/legacy/050.crlf.json +++ b/resources/eml/legacy/050.crlf.json @@ -255,7 +255,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1646,7 +1646,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/050.json b/resources/eml/legacy/050.json index ad2d7d1b..b7acd92c 100644 --- a/resources/eml/legacy/050.json +++ b/resources/eml/legacy/050.json @@ -255,7 +255,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1646,7 +1646,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/051.crlf.json b/resources/eml/legacy/051.crlf.json index 308013f3..aba30252 100644 --- a/resources/eml/legacy/051.crlf.json +++ b/resources/eml/legacy/051.crlf.json @@ -290,7 +290,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1681,7 +1681,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/legacy/051.json b/resources/eml/legacy/051.json index 308013f3..aba30252 100644 --- a/resources/eml/legacy/051.json +++ b/resources/eml/legacy/051.json @@ -290,7 +290,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, @@ -1681,7 +1681,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/thirdparty/011.crlf.json b/resources/eml/thirdparty/011.crlf.json index bfb1da9d..e6ee9c58 100644 --- a/resources/eml/thirdparty/011.crlf.json +++ b/resources/eml/thirdparty/011.crlf.json @@ -367,7 +367,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/resources/eml/thirdparty/011.json b/resources/eml/thirdparty/011.json index b81bd6c1..de55e3e3 100644 --- a/resources/eml/thirdparty/011.json +++ b/resources/eml/thirdparty/011.json @@ -367,7 +367,7 @@ ], "is_encoding_problem": false, "body": { - "Binary": [ + "InlineBinary": [ 137, 80, 78, diff --git a/src/parsers/message.rs b/src/parsers/message.rs index 05bd9dd2..12ff9db0 100644 --- a/src/parsers/message.rs +++ b/src/parsers/message.rs @@ -264,6 +264,14 @@ impl MessageParser { } let body_part = if mime_type != MimeType::Message { + let additional_inline = mime_type == MimeType::Inline + && part_headers + .header_value(&HeaderName::ContentDisposition) + .map_or(false, |d| { + d.as_content_type().is_some_and(|ct| ct.is_inline()) + }) + && state.mime_type == MimeType::MultipartRelated; + let is_inline = is_inline && part_headers .header_value(&HeaderName::ContentDisposition) @@ -343,7 +351,7 @@ impl MessageParser { } else { PartType::Text(text) } - } else if is_inline { + } else if is_inline || additional_inline { PartType::InlineBinary(bytes) } else { PartType::Binary(bytes) From 6be4e601fe9a21783d524f1fbaf3873c2f2eea31 Mon Sep 17 00:00:00 2001 From: c Date: Thu, 5 Dec 2024 13:51:58 +0100 Subject: [PATCH 6/7] helper diff: which attachments switched from PartType::Binary to PartType::InlineBinary --- resources/eml/legacy/015.crlf.json | 8 ++++++-- resources/eml/legacy/015.json | 8 ++++++-- resources/eml/legacy/018.crlf.json | 8 ++++++-- resources/eml/legacy/018.json | 8 ++++++-- resources/eml/legacy/024.crlf.json | 8 ++++++-- resources/eml/legacy/024.json | 8 ++++++-- resources/eml/legacy/025.crlf.json | 8 ++++++-- resources/eml/legacy/025.json | 8 ++++++-- resources/eml/legacy/035.crlf.json | 2 ++ resources/eml/legacy/035.json | 2 ++ resources/eml/legacy/039.crlf.json | 4 ++++ resources/eml/legacy/039.json | 4 ++++ resources/eml/legacy/050.crlf.json | 8 ++++++-- resources/eml/legacy/050.json | 8 ++++++-- resources/eml/legacy/051.crlf.json | 8 ++++++-- resources/eml/legacy/051.json | 8 ++++++-- resources/eml/thirdparty/011.crlf.json | 3 ++- resources/eml/thirdparty/011.json | 3 ++- 18 files changed, 88 insertions(+), 26 deletions(-) diff --git a/resources/eml/legacy/015.crlf.json b/resources/eml/legacy/015.crlf.json index 6737c56a..f3298613 100644 --- a/resources/eml/legacy/015.crlf.json +++ b/resources/eml/legacy/015.crlf.json @@ -1,9 +1,13 @@ { "html_body": [ - 4 + 4, + 5, + 6 ], "text_body": [ - 3 + 3, + 5, + 6 ], "attachments": [ 5, diff --git a/resources/eml/legacy/015.json b/resources/eml/legacy/015.json index 6737c56a..f3298613 100644 --- a/resources/eml/legacy/015.json +++ b/resources/eml/legacy/015.json @@ -1,9 +1,13 @@ { "html_body": [ - 4 + 4, + 5, + 6 ], "text_body": [ - 3 + 3, + 5, + 6 ], "attachments": [ 5, diff --git a/resources/eml/legacy/018.crlf.json b/resources/eml/legacy/018.crlf.json index da36f888..7b63957f 100644 --- a/resources/eml/legacy/018.crlf.json +++ b/resources/eml/legacy/018.crlf.json @@ -1,9 +1,13 @@ { "html_body": [ - 3 + 3, + 4, + 5 ], "text_body": [ - 2 + 2, + 4, + 5 ], "attachments": [ 4, diff --git a/resources/eml/legacy/018.json b/resources/eml/legacy/018.json index da36f888..7b63957f 100644 --- a/resources/eml/legacy/018.json +++ b/resources/eml/legacy/018.json @@ -1,9 +1,13 @@ { "html_body": [ - 3 + 3, + 4, + 5 ], "text_body": [ - 2 + 2, + 4, + 5 ], "attachments": [ 4, diff --git a/resources/eml/legacy/024.crlf.json b/resources/eml/legacy/024.crlf.json index 33cf248e..5e9aa6b2 100644 --- a/resources/eml/legacy/024.crlf.json +++ b/resources/eml/legacy/024.crlf.json @@ -1,9 +1,13 @@ { "html_body": [ - 1 + 1, + 2, + 3 ], "text_body": [ - 1 + 1, + 2, + 3 ], "attachments": [ 2, diff --git a/resources/eml/legacy/024.json b/resources/eml/legacy/024.json index 33cf248e..5e9aa6b2 100644 --- a/resources/eml/legacy/024.json +++ b/resources/eml/legacy/024.json @@ -1,9 +1,13 @@ { "html_body": [ - 1 + 1, + 2, + 3 ], "text_body": [ - 1 + 1, + 2, + 3 ], "attachments": [ 2, diff --git a/resources/eml/legacy/025.crlf.json b/resources/eml/legacy/025.crlf.json index be63cbc8..15882f9b 100644 --- a/resources/eml/legacy/025.crlf.json +++ b/resources/eml/legacy/025.crlf.json @@ -1,9 +1,13 @@ { "html_body": [ - 2 + 2, + 3, + 4 ], "text_body": [ - 2 + 2, + 3, + 4 ], "attachments": [ 3, diff --git a/resources/eml/legacy/025.json b/resources/eml/legacy/025.json index be63cbc8..15882f9b 100644 --- a/resources/eml/legacy/025.json +++ b/resources/eml/legacy/025.json @@ -1,9 +1,13 @@ { "html_body": [ - 2 + 2, + 3, + 4 ], "text_body": [ - 2 + 2, + 3, + 4 ], "attachments": [ 3, diff --git a/resources/eml/legacy/035.crlf.json b/resources/eml/legacy/035.crlf.json index 9a81e470..24e63476 100644 --- a/resources/eml/legacy/035.crlf.json +++ b/resources/eml/legacy/035.crlf.json @@ -1,6 +1,8 @@ { "html_body": [ 4, + 5, + 6, 7, 8 ], diff --git a/resources/eml/legacy/035.json b/resources/eml/legacy/035.json index 9a81e470..24e63476 100644 --- a/resources/eml/legacy/035.json +++ b/resources/eml/legacy/035.json @@ -1,6 +1,8 @@ { "html_body": [ 4, + 5, + 6, 7, 8 ], diff --git a/resources/eml/legacy/039.crlf.json b/resources/eml/legacy/039.crlf.json index 57fb0d32..7cf28576 100644 --- a/resources/eml/legacy/039.crlf.json +++ b/resources/eml/legacy/039.crlf.json @@ -1,11 +1,15 @@ { "html_body": [ 2, + 3, + 4, 5, 6 ], "text_body": [ 2, + 3, + 4, 5, 6 ], diff --git a/resources/eml/legacy/039.json b/resources/eml/legacy/039.json index 57fb0d32..7cf28576 100644 --- a/resources/eml/legacy/039.json +++ b/resources/eml/legacy/039.json @@ -1,11 +1,15 @@ { "html_body": [ 2, + 3, + 4, 5, 6 ], "text_body": [ 2, + 3, + 4, 5, 6 ], diff --git a/resources/eml/legacy/050.crlf.json b/resources/eml/legacy/050.crlf.json index b7acd92c..5ec37ff8 100644 --- a/resources/eml/legacy/050.crlf.json +++ b/resources/eml/legacy/050.crlf.json @@ -1,9 +1,13 @@ { "html_body": [ - 1 + 1, + 2, + 3 ], "text_body": [ - 1 + 1, + 2, + 3 ], "attachments": [ 2, diff --git a/resources/eml/legacy/050.json b/resources/eml/legacy/050.json index b7acd92c..5ec37ff8 100644 --- a/resources/eml/legacy/050.json +++ b/resources/eml/legacy/050.json @@ -1,9 +1,13 @@ { "html_body": [ - 1 + 1, + 2, + 3 ], "text_body": [ - 1 + 1, + 2, + 3 ], "attachments": [ 2, diff --git a/resources/eml/legacy/051.crlf.json b/resources/eml/legacy/051.crlf.json index aba30252..97f2bf70 100644 --- a/resources/eml/legacy/051.crlf.json +++ b/resources/eml/legacy/051.crlf.json @@ -1,9 +1,13 @@ { "html_body": [ - 2 + 2, + 3, + 4 ], "text_body": [ - 2 + 2, + 3, + 4 ], "attachments": [ 3, diff --git a/resources/eml/legacy/051.json b/resources/eml/legacy/051.json index aba30252..97f2bf70 100644 --- a/resources/eml/legacy/051.json +++ b/resources/eml/legacy/051.json @@ -1,9 +1,13 @@ { "html_body": [ - 2 + 2, + 3, + 4 ], "text_body": [ - 2 + 2, + 3, + 4 ], "attachments": [ 3, diff --git a/resources/eml/thirdparty/011.crlf.json b/resources/eml/thirdparty/011.crlf.json index e6ee9c58..4a14c64a 100644 --- a/resources/eml/thirdparty/011.crlf.json +++ b/resources/eml/thirdparty/011.crlf.json @@ -1,6 +1,7 @@ { "html_body": [ - 3 + 3, + 4 ], "text_body": [ 1 diff --git a/resources/eml/thirdparty/011.json b/resources/eml/thirdparty/011.json index de55e3e3..e2743da1 100644 --- a/resources/eml/thirdparty/011.json +++ b/resources/eml/thirdparty/011.json @@ -1,6 +1,7 @@ { "html_body": [ - 3 + 3, + 4 ], "text_body": [ 1 From 8ec3a6c553ca8c361b6eda9607e87434cb9b32a7 Mon Sep 17 00:00:00 2001 From: c Date: Thu, 5 Dec 2024 13:52:13 +0100 Subject: [PATCH 7/7] Revert "helper diff: which attachments switched from PartType::Binary to PartType::InlineBinary" This reverts commit c733e175626015502d2c22c9d6d0651b60f87b0b. --- resources/eml/legacy/015.crlf.json | 8 ++------ resources/eml/legacy/015.json | 8 ++------ resources/eml/legacy/018.crlf.json | 8 ++------ resources/eml/legacy/018.json | 8 ++------ resources/eml/legacy/024.crlf.json | 8 ++------ resources/eml/legacy/024.json | 8 ++------ resources/eml/legacy/025.crlf.json | 8 ++------ resources/eml/legacy/025.json | 8 ++------ resources/eml/legacy/035.crlf.json | 2 -- resources/eml/legacy/035.json | 2 -- resources/eml/legacy/039.crlf.json | 4 ---- resources/eml/legacy/039.json | 4 ---- resources/eml/legacy/050.crlf.json | 8 ++------ resources/eml/legacy/050.json | 8 ++------ resources/eml/legacy/051.crlf.json | 8 ++------ resources/eml/legacy/051.json | 8 ++------ resources/eml/thirdparty/011.crlf.json | 3 +-- resources/eml/thirdparty/011.json | 3 +-- 18 files changed, 26 insertions(+), 88 deletions(-) diff --git a/resources/eml/legacy/015.crlf.json b/resources/eml/legacy/015.crlf.json index f3298613..6737c56a 100644 --- a/resources/eml/legacy/015.crlf.json +++ b/resources/eml/legacy/015.crlf.json @@ -1,13 +1,9 @@ { "html_body": [ - 4, - 5, - 6 + 4 ], "text_body": [ - 3, - 5, - 6 + 3 ], "attachments": [ 5, diff --git a/resources/eml/legacy/015.json b/resources/eml/legacy/015.json index f3298613..6737c56a 100644 --- a/resources/eml/legacy/015.json +++ b/resources/eml/legacy/015.json @@ -1,13 +1,9 @@ { "html_body": [ - 4, - 5, - 6 + 4 ], "text_body": [ - 3, - 5, - 6 + 3 ], "attachments": [ 5, diff --git a/resources/eml/legacy/018.crlf.json b/resources/eml/legacy/018.crlf.json index 7b63957f..da36f888 100644 --- a/resources/eml/legacy/018.crlf.json +++ b/resources/eml/legacy/018.crlf.json @@ -1,13 +1,9 @@ { "html_body": [ - 3, - 4, - 5 + 3 ], "text_body": [ - 2, - 4, - 5 + 2 ], "attachments": [ 4, diff --git a/resources/eml/legacy/018.json b/resources/eml/legacy/018.json index 7b63957f..da36f888 100644 --- a/resources/eml/legacy/018.json +++ b/resources/eml/legacy/018.json @@ -1,13 +1,9 @@ { "html_body": [ - 3, - 4, - 5 + 3 ], "text_body": [ - 2, - 4, - 5 + 2 ], "attachments": [ 4, diff --git a/resources/eml/legacy/024.crlf.json b/resources/eml/legacy/024.crlf.json index 5e9aa6b2..33cf248e 100644 --- a/resources/eml/legacy/024.crlf.json +++ b/resources/eml/legacy/024.crlf.json @@ -1,13 +1,9 @@ { "html_body": [ - 1, - 2, - 3 + 1 ], "text_body": [ - 1, - 2, - 3 + 1 ], "attachments": [ 2, diff --git a/resources/eml/legacy/024.json b/resources/eml/legacy/024.json index 5e9aa6b2..33cf248e 100644 --- a/resources/eml/legacy/024.json +++ b/resources/eml/legacy/024.json @@ -1,13 +1,9 @@ { "html_body": [ - 1, - 2, - 3 + 1 ], "text_body": [ - 1, - 2, - 3 + 1 ], "attachments": [ 2, diff --git a/resources/eml/legacy/025.crlf.json b/resources/eml/legacy/025.crlf.json index 15882f9b..be63cbc8 100644 --- a/resources/eml/legacy/025.crlf.json +++ b/resources/eml/legacy/025.crlf.json @@ -1,13 +1,9 @@ { "html_body": [ - 2, - 3, - 4 + 2 ], "text_body": [ - 2, - 3, - 4 + 2 ], "attachments": [ 3, diff --git a/resources/eml/legacy/025.json b/resources/eml/legacy/025.json index 15882f9b..be63cbc8 100644 --- a/resources/eml/legacy/025.json +++ b/resources/eml/legacy/025.json @@ -1,13 +1,9 @@ { "html_body": [ - 2, - 3, - 4 + 2 ], "text_body": [ - 2, - 3, - 4 + 2 ], "attachments": [ 3, diff --git a/resources/eml/legacy/035.crlf.json b/resources/eml/legacy/035.crlf.json index 24e63476..9a81e470 100644 --- a/resources/eml/legacy/035.crlf.json +++ b/resources/eml/legacy/035.crlf.json @@ -1,8 +1,6 @@ { "html_body": [ 4, - 5, - 6, 7, 8 ], diff --git a/resources/eml/legacy/035.json b/resources/eml/legacy/035.json index 24e63476..9a81e470 100644 --- a/resources/eml/legacy/035.json +++ b/resources/eml/legacy/035.json @@ -1,8 +1,6 @@ { "html_body": [ 4, - 5, - 6, 7, 8 ], diff --git a/resources/eml/legacy/039.crlf.json b/resources/eml/legacy/039.crlf.json index 7cf28576..57fb0d32 100644 --- a/resources/eml/legacy/039.crlf.json +++ b/resources/eml/legacy/039.crlf.json @@ -1,15 +1,11 @@ { "html_body": [ 2, - 3, - 4, 5, 6 ], "text_body": [ 2, - 3, - 4, 5, 6 ], diff --git a/resources/eml/legacy/039.json b/resources/eml/legacy/039.json index 7cf28576..57fb0d32 100644 --- a/resources/eml/legacy/039.json +++ b/resources/eml/legacy/039.json @@ -1,15 +1,11 @@ { "html_body": [ 2, - 3, - 4, 5, 6 ], "text_body": [ 2, - 3, - 4, 5, 6 ], diff --git a/resources/eml/legacy/050.crlf.json b/resources/eml/legacy/050.crlf.json index 5ec37ff8..b7acd92c 100644 --- a/resources/eml/legacy/050.crlf.json +++ b/resources/eml/legacy/050.crlf.json @@ -1,13 +1,9 @@ { "html_body": [ - 1, - 2, - 3 + 1 ], "text_body": [ - 1, - 2, - 3 + 1 ], "attachments": [ 2, diff --git a/resources/eml/legacy/050.json b/resources/eml/legacy/050.json index 5ec37ff8..b7acd92c 100644 --- a/resources/eml/legacy/050.json +++ b/resources/eml/legacy/050.json @@ -1,13 +1,9 @@ { "html_body": [ - 1, - 2, - 3 + 1 ], "text_body": [ - 1, - 2, - 3 + 1 ], "attachments": [ 2, diff --git a/resources/eml/legacy/051.crlf.json b/resources/eml/legacy/051.crlf.json index 97f2bf70..aba30252 100644 --- a/resources/eml/legacy/051.crlf.json +++ b/resources/eml/legacy/051.crlf.json @@ -1,13 +1,9 @@ { "html_body": [ - 2, - 3, - 4 + 2 ], "text_body": [ - 2, - 3, - 4 + 2 ], "attachments": [ 3, diff --git a/resources/eml/legacy/051.json b/resources/eml/legacy/051.json index 97f2bf70..aba30252 100644 --- a/resources/eml/legacy/051.json +++ b/resources/eml/legacy/051.json @@ -1,13 +1,9 @@ { "html_body": [ - 2, - 3, - 4 + 2 ], "text_body": [ - 2, - 3, - 4 + 2 ], "attachments": [ 3, diff --git a/resources/eml/thirdparty/011.crlf.json b/resources/eml/thirdparty/011.crlf.json index 4a14c64a..e6ee9c58 100644 --- a/resources/eml/thirdparty/011.crlf.json +++ b/resources/eml/thirdparty/011.crlf.json @@ -1,7 +1,6 @@ { "html_body": [ - 3, - 4 + 3 ], "text_body": [ 1 diff --git a/resources/eml/thirdparty/011.json b/resources/eml/thirdparty/011.json index e2743da1..de55e3e3 100644 --- a/resources/eml/thirdparty/011.json +++ b/resources/eml/thirdparty/011.json @@ -1,7 +1,6 @@ { "html_body": [ - 3, - 4 + 3 ], "text_body": [ 1