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

cargo fmt

Browse Source
This commit is contained in:
holger krekel
2019-08-20 09:31:05 +02:00
parent 9633f251e0
commit f47e637519
1 changed files with 117 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

235
src/imap.rs
View File

@@ -1312,95 +1312,94 @@ impl Imap {
if !self.is_connected() { if !self.is_connected() {
return ImapResult::RetryLater; return ImapResult::RetryLater;
} }
info!( info!(
context,
0,
"Marking message {}/{} as $MDNSent...",
folder.as_ref(),
uid,
);
if !self.select_folder(context, Some(folder.as_ref())) {
warn!(
context, context,
0, 0,
"Marking message {}/{} as $MDNSent...", "Cannot select folder {} for setting $MDNSent flag.",
folder.as_ref(), folder.as_ref()
uid,
); );
return ImapResult::Failed;
}
// Check if the folder can handle the `$MDNSent` flag (see RFC 3503). If so, and not
// set: set the flags and return this information.
// If the folder cannot handle the `$MDNSent` flag, we risk duplicated MDNs; it's up
// to the receiving MUA to handle this then (eg. Delta Chat has no problem with this).
if !self.select_folder(context, Some(folder.as_ref())) { let can_create_flag = self
warn!( .config
context, .read()
0, .unwrap()
"Cannot select folder {} for setting $MDNSent flag.", .selected_mailbox
folder.as_ref() .as_ref()
); .map(|mbox| {
return ImapResult::Failed; // empty means, everything can be stored
} mbox.permanent_flags.is_empty()
// Check if the folder can handle the `$MDNSent` flag (see RFC 3503). If so, and not || mbox
// set: set the flags and return this information. .permanent_flags
// If the folder cannot handle the `$MDNSent` flag, we risk duplicated MDNs; it's up .iter()
// to the receiving MUA to handle this then (eg. Delta Chat has no problem with this). .find(|flag| match flag {
imap::types::Flag::Custom(s) => s == "$MDNSent",
_ => false,
})
.is_some()
})
.expect("just selected folder");
let can_create_flag = self if !can_create_flag {
.config info!(
.read() context,
.unwrap() 0, "Cannot store $MDNSent flags, ignoring to prevent duplicate MDN.",
.selected_mailbox );
.as_ref() return ImapResult::Success;
.map(|mbox| { }
// empty means, everything can be stored
mbox.permanent_flags.is_empty()
|| mbox
.permanent_flags
.iter()
.find(|flag| match flag {
imap::types::Flag::Custom(s) => s == "$MDNSent",
_ => false,
})
.is_some()
})
.expect("just selected folder");
if !can_create_flag { let set = format!("{}", uid);
info!(
context, let fetched_msgs = if let Some(ref mut session) = &mut *self.session.lock().unwrap() {
0, "Cannot store $MDNSent flags, ignoring to prevent duplicate MDN.", match session.uid_fetch(set, FETCH_FLAGS) {
); Ok(res) => res,
return ImapResult::Success; Err(err) => {
eprintln!("fetch error: {:?}", err);
return ImapResult::Failed;
} }
}
} else {
unreachable!();
};
let set = format!("{}", uid); let flag_set = fetched_msgs
.first()
.map(|msg| {
msg.flags()
.iter()
.find(|flag| match flag {
imap::types::Flag::Custom(s) => s == "$MDNSent",
_ => false,
})
.is_some()
})
.unwrap_or_else(|| false);
let fetched_msgs = if flag_set {
if let Some(ref mut session) = &mut *self.session.lock().unwrap() { info!(context, 0, "$MDNSent already set and MDN already sent.");
match session.uid_fetch(set, FETCH_FLAGS) { ImapResult::AlreadyDone
Ok(res) => res, } else if self.add_flag(context, uid, "$MDNSent") {
Err(err) => { info!(context, 0, "$MDNSent just set and MDN will be sent.");
eprintln!("fetch error: {:?}", err); ImapResult::Success
return ImapResult::Failed } else if self.should_reconnect() {
} ImapResult::RetryLater
} } else {
} else { ImapResult::Failed
unreachable!(); }
};
let flag_set = fetched_msgs
.first()
.map(|msg| {
msg.flags()
.iter()
.find(|flag| match flag {
imap::types::Flag::Custom(s) => s == "$MDNSent",
_ => false,
})
.is_some()
})
.unwrap_or_else(|| false);
if flag_set {
info!(context, 0, "$MDNSent already set and MDN already sent.");
ImapResult::AlreadyDone
} else if self.add_flag(context, uid, "$MDNSent") {
info!(context, 0, "$MDNSent just set and MDN will be sent.");
ImapResult::Success
} else if self.should_reconnect() {
ImapResult::RetryLater
} else {
ImapResult::Failed
}
} }
pub fn delete_msg<S1: AsRef<str>, S2: AsRef<str>>( pub fn delete_msg<S1: AsRef<str>, S2: AsRef<str>>(
@@ -1434,55 +1433,55 @@ impl Imap {
); );
return ImapResult::RetryLater; return ImapResult::RetryLater;
} }
let set = format!("{}", server_uid); let set = format!("{}", server_uid);
if let Some(ref mut session) = &mut *self.session.lock().unwrap() { if let Some(ref mut session) = &mut *self.session.lock().unwrap() {
match session.uid_fetch(set, PREFETCH_FLAGS) { match session.uid_fetch(set, PREFETCH_FLAGS) {
Ok(msgs) => { Ok(msgs) => {
if msgs.is_empty() if msgs.is_empty()
|| msgs || msgs
.first() .first()
.unwrap() .unwrap()
.envelope() .envelope()
.expect("missing envelope") .expect("missing envelope")
.message_id .message_id
.expect("missing message id") .expect("missing message id")
!= message_id.as_ref() != message_id.as_ref()
{ {
warn!(
context,
0,
"Cannot delete on IMAP, {}/{} does not match {}.",
folder.as_ref(),
server_uid,
message_id.as_ref(),
);
*server_uid = 0;
return ImapResult::Failed;
}
}
Err(err) => {
warn!( warn!(
context, context,
0, 0,
"Cannot delete on IMAP, {}/{}, fetch error {:?}.", "Cannot delete on IMAP, {}/{} does not match {}.",
folder.as_ref(), folder.as_ref(),
server_uid, server_uid,
err message_id.as_ref(),
); );
*server_uid = 0; *server_uid = 0;
return ImapResult::Failed; return ImapResult::Failed;
} }
} }
Err(err) => {
warn!(
context,
0,
"Cannot delete on IMAP, {}/{}, fetch error {:?}.",
folder.as_ref(),
server_uid,
err
);
*server_uid = 0;
return ImapResult::Failed;
}
} }
// mark the message for deletion }
if !self.add_flag(context, *server_uid, "\\Deleted") { // mark the message for deletion
warn!(context, 0, "Cannot mark message as \"Deleted\"."); if !self.add_flag(context, *server_uid, "\\Deleted") {
*server_uid = 0; warn!(context, 0, "Cannot mark message as \"Deleted\".");
ImapResult::Failed *server_uid = 0;
} else { ImapResult::Failed
self.config.write().unwrap().selected_folder_needs_expunge = true; } else {
ImapResult::Success self.config.write().unwrap().selected_folder_needs_expunge = true;
} ImapResult::Success
}
} }
pub fn configure_folders(&self, context: &Context, flags: libc::c_int) { pub fn configure_folders(&self, context: &Context, flags: libc::c_int) {