Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 23:06:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

dc_receive_imf: remove cleanup() closure

Browse Source 
Do not send any events in case of `add_parts` error.
This commit is contained in:
link2xt
2021-06-27 21:09:59 +03:00
parent a6ad457065
commit 8700cf0aba
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/dc_receive_imf.rs
View File

@@ -129,21 +129,6 @@ pub(crate) async fn dc_receive_imf_inner(
let mut created_db_entries = Vec::new(); let mut created_db_entries = Vec::new();
let mut create_event_to_send = Some(CreateEvent::MsgsChanged); let mut create_event_to_send = Some(CreateEvent::MsgsChanged);
// helper method to handle early exit and memory cleanup
let cleanup = |context: &Context,
create_event_to_send: &Option<CreateEvent>,
created_db_entries: Vec<(ChatId, MsgId)>| {
if let Some(create_event_to_send) = create_event_to_send {
for (chat_id, msg_id) in created_db_entries {
let event = match create_event_to_send {
CreateEvent::MsgsChanged => EventType::MsgsChanged { msg_id, chat_id },
CreateEvent::IncomingMsg => EventType::IncomingMsg { msg_id, chat_id },
};
context.emit_event(event);
}
}
};
let prevent_rename = let prevent_rename =
mime_parser.is_mailinglist_message() || mime_parser.get(HeaderDef::Sender).is_some(); mime_parser.is_mailinglist_message() || mime_parser.get(HeaderDef::Sender).is_some();
@@ -180,7 +165,7 @@ pub(crate) async fn dc_receive_imf_inner(
// Add parts // Add parts
if mime_parser.parts.last().is_some() { if mime_parser.parts.last().is_some() {
if let Err(err) = add_parts( add_parts(
context, context,
&mut mime_parser, &mut mime_parser,
imf_raw, imf_raw,
@@ -203,10 +188,7 @@ pub(crate) async fn dc_receive_imf_inner(
prevent_rename, prevent_rename,
) )
.await .await
{ .map_err(|err| err.context("add_parts error"))?;
cleanup(context, &create_event_to_send, created_db_entries);
bail!("add_parts error: {:?}", err);
}
} else { } else {
// there are parts in this message, do some basic calculations so that the variables // there are parts in this message, do some basic calculations so that the variables
// are correct in the further processing // are correct in the further processing
@@ -311,7 +293,15 @@ pub(crate) async fn dc_receive_imf_inner(
"received message {} has Message-Id: {}", server_uid, rfc724_mid "received message {} has Message-Id: {}", server_uid, rfc724_mid
); );
cleanup(context, &create_event_to_send, created_db_entries); if let Some(create_event_to_send) = create_event_to_send {
for (chat_id, msg_id) in created_db_entries {
let event = match create_event_to_send {
CreateEvent::MsgsChanged => EventType::MsgsChanged { msg_id, chat_id },
CreateEvent::IncomingMsg => EventType::IncomingMsg { msg_id, chat_id },
};
context.emit_event(event);
}
}
mime_parser mime_parser
.handle_reports(context, from_id, sent_timestamp, &mime_parser.parts) .handle_reports(context, from_id, sent_timestamp, &mime_parser.parts)