Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 18:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove commented errors and fix fmt

Browse Source
This commit is contained in:
holger krekel
2019-11-30 01:37:08 +01:00
committed by Floris Bruynooghe
parent b6e9bcee3c
commit 8f43d7fa34
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/error.rs
View File

@@ -54,12 +54,6 @@ pub enum Error {
ImapInTeardown,
#[fail(display = "No IMAP Connection established")]
ImapNoConnection,
/*
#[fail(display = "IMAP Connection lost: {:?}", _0)]
ImapConnectionLost(String),
#[fail(display = "Failed to obtain Imap Session")]
CouldNotObtainImapSession,
*/
}
pub type Result<T> = std::result::Result<T, Error>;

19
src/imap.rs
View File

@@ -40,7 +40,7 @@ pub enum ImapActionResult {
}
const PREFETCH_FLAGS: &str = "(UID ENVELOPE)";
const JUST_UID : &str = "(UID)";
const JUST_UID: &str = "(UID)";
const BODY_FLAGS: &str = "(FLAGS BODY.PEEK[])";
const SELECT_ALL: &str = "1:*";
@@ -577,16 +577,23 @@ impl Imap {
return Ok(false);
}
// uid_validity has changed or is being set the first time.
// find the last seen uid within the new uid_validity scope.
// uid_validity has changed or is being set the first time.
// find the last seen uid within the new uid_validity scope.
let new_last_seen_uid = if mailbox.uid_next.is_none() {
warn!(context, "IMAP folder did not report uid_next, falling back to fetching");
warn!(
context,
"IMAP folder did not report uid_next, falling back to fetching"
);
if let Some(ref mut session) = &mut *self.session.lock().await {
// `FETCH <message sequence number> (UID)`
let set = format!("{}:*", mailbox.exists);
match session.fetch(set, JUST_UID).await {
Ok(list) => list.iter().last().and_then(|res| res.uid).unwrap_or_default(),
Ok(list) => list
.iter()
.last()
.and_then(|res| res.uid)
.unwrap_or_default(),
Err(err) => {
bail!("fetch failed: {:?}", err);
}
@@ -597,7 +604,7 @@ impl Imap {
} else {
mailbox.uid_next.unwrap() - 1
};
self.set_config_last_seen_uid(context, &folder, new_uid_validity, new_last_seen_uid);
info!(
context,