From 5a4040cf0be0dad9152f369012178705a01f7b15 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 16 Feb 2020 00:36:25 +0300 Subject: [PATCH] cargo fmt --- src/mimeparser.rs | 106 +++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/src/mimeparser.rs b/src/mimeparser.rs index 5a210bc03..e8a665c8b 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -598,60 +598,60 @@ impl MimeMessage { let old_part_count = self.parts.len(); match filename { - Some(filename) => { - self.do_add_single_file_part( - context, - msg_type, - mime_type, - &raw_mime, - &mail.get_body_raw()?, - &filename, - ); - } - None => { - match mime_type.type_() { - mime::IMAGE | mime::AUDIO | mime::VIDEO | mime::APPLICATION => { - warn!(context, "Missing attachment"); - return Ok(false); - } - mime::TEXT | mime::HTML => { - let decoded_data = match mail.get_body() { - Ok(decoded_data) => decoded_data, - Err(err) => { - warn!(context, "Invalid body parsed {:?}", err); - // Note that it's not always an error - might be no data - return Ok(false); - } - }; - - let (simplified_txt, is_forwarded) = if decoded_data.is_empty() { - ("".into(), false) - } else { - let is_html = mime_type == mime::TEXT_HTML; - let out = if is_html { - dehtml(&decoded_data) - } else { - decoded_data.clone() - }; - simplify(out, self.has_chat_version()) - }; - - if !simplified_txt.is_empty() { - let mut part = Part::default(); - part.typ = Viewtype::Text; - part.mimetype = Some(mime_type); - part.msg = simplified_txt; - part.msg_raw = Some(decoded_data); - self.do_add_single_part(part); - } - - if is_forwarded { - self.is_forwarded = true; - } - } - _ => {} + Some(filename) => { + self.do_add_single_file_part( + context, + msg_type, + mime_type, + &raw_mime, + &mail.get_body_raw()?, + &filename, + ); + } + None => { + match mime_type.type_() { + mime::IMAGE | mime::AUDIO | mime::VIDEO | mime::APPLICATION => { + warn!(context, "Missing attachment"); + return Ok(false); + } + mime::TEXT | mime::HTML => { + let decoded_data = match mail.get_body() { + Ok(decoded_data) => decoded_data, + Err(err) => { + warn!(context, "Invalid body parsed {:?}", err); + // Note that it's not always an error - might be no data + return Ok(false); + } + }; + + let (simplified_txt, is_forwarded) = if decoded_data.is_empty() { + ("".into(), false) + } else { + let is_html = mime_type == mime::TEXT_HTML; + let out = if is_html { + dehtml(&decoded_data) + } else { + decoded_data.clone() + }; + simplify(out, self.has_chat_version()) + }; + + if !simplified_txt.is_empty() { + let mut part = Part::default(); + part.typ = Viewtype::Text; + part.mimetype = Some(mime_type); + part.msg = simplified_txt; + part.msg_raw = Some(decoded_data); + self.do_add_single_part(part); + } + + if is_forwarded { + self.is_forwarded = true; + } + } + _ => {} + } } - } } // add object? (we do not add all objects, eg. signatures etc. are ignored)