Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-01 20:36:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

make select_folder return ImapActionResult's and early-return from idle if there is no selected folder

Browse Source
This commit is contained in:
holger krekel
2019-11-11 14:07:11 +01:00
parent 01fe782fa0
commit 131f54fbf1
1 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/imap.rs
View File

@@ -396,12 +396,16 @@ impl Imap {
}) })
} }
async fn select_folder<S: AsRef<str>>(&self, context: &Context, folder: Option<S>) -> usize { async fn select_folder<S: AsRef<str>>(
&self,
context: &Context,
folder: Option<S>,
) -> ImapActionResult {
if self.session.lock().await.is_none() { if self.session.lock().await.is_none() {
let mut cfg = self.config.write().await; let mut cfg = self.config.write().await;
cfg.selected_folder = None; cfg.selected_folder = None;
cfg.selected_folder_needs_expunge = false; cfg.selected_folder_needs_expunge = false;
return 0; return ImapActionResult::Failed;
} }
// if there is a new folder and the new folder is equal to the selected one, there's nothing to do. // if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
@@ -409,7 +413,7 @@ impl Imap {
if let Some(ref folder) = folder { if let Some(ref folder) = folder {
if let Some(ref selected_folder) = self.config.read().await.selected_folder { if let Some(ref selected_folder) = self.config.read().await.selected_folder {
if folder.as_ref() == selected_folder { if folder.as_ref() == selected_folder {
return 1; return ImapActionResult::AlreadyDone;
} }
} }
} }
@@ -429,11 +433,11 @@ impl Imap {
} }
Err(err) => { Err(err) => {
warn!(context, "failed to close session: {:?}", err); warn!(context, "failed to close session: {:?}", err);
return 0; return ImapActionResult::Failed;
} }
} }
} else { } else {
return 0; return ImapActionResult::Failed;
} }
} }
self.config.write().await.selected_folder_needs_expunge = false; self.config.write().await.selected_folder_needs_expunge = false;
@@ -449,7 +453,7 @@ impl Imap {
config.selected_mailbox = Some(mailbox); config.selected_mailbox = Some(mailbox);
} }
Err(err) => { Err(err) => {
info!( warn!(
context, context,
"Cannot select folder: {}; {:?}.", "Cannot select folder: {}; {:?}.",
folder.as_ref(), folder.as_ref(),
@@ -458,7 +462,7 @@ impl Imap {
self.config.write().await.selected_folder = None; self.config.write().await.selected_folder = None;
self.should_reconnect.store(true, Ordering::Relaxed); self.should_reconnect.store(true, Ordering::Relaxed);
return 0; return ImapActionResult::Failed;
} }
} }
} else { } else {
@@ -466,7 +470,7 @@ impl Imap {
} }
} }
1 ImapActionResult::Success
} }
fn get_config_last_seen_uid<S: AsRef<str>>(&self, context: &Context, folder: S) -> (u32, u32) { fn get_config_last_seen_uid<S: AsRef<str>>(&self, context: &Context, folder: S) -> (u32, u32) {
@@ -502,13 +506,13 @@ impl Imap {
return 0; return 0;
} }
if self.select_folder(context, Some(&folder)).await == 0 { let res = self.select_folder(context, Some(&folder)).await;
if res == ImapActionResult::Failed || res == ImapActionResult::RetryLater {
info!( info!(
context, context,
"Cannot select folder \"{}\" for fetching.", "Cannot select folder \"{}\" for fetching.",
folder.as_ref() folder.as_ref()
); );
return 0; return 0;
} }
@@ -748,6 +752,9 @@ impl Imap {
pub fn idle(&self, context: &Context) { pub fn idle(&self, context: &Context) {
task::block_on(async move { task::block_on(async move {
if self.config.read().await.selected_folder.is_none() {
return;
}
if !self.config.read().await.can_idle { if !self.config.read().await.can_idle {
self.fake_idle(context).await; self.fake_idle(context).await;
return; return;
@@ -756,12 +763,19 @@ impl Imap {
self.setup_handle_if_needed(context); self.setup_handle_if_needed(context);
let watch_folder = self.config.read().await.watch_folder.clone(); let watch_folder = self.config.read().await.watch_folder.clone();
if self.select_folder(context, watch_folder.as_ref()).await == 0 { match self.select_folder(context, watch_folder.as_ref()).await {
warn!(context, "IMAP-IDLE not setup."); ImapActionResult::Success | ImapActionResult::AlreadyDone => {}
ImapActionResult::Failed | ImapActionResult::RetryLater => {
warn!(
context,
"idle select_folder failed {:?}",
watch_folder.as_ref()
);
self.fake_idle(context).await; self.fake_idle(context).await;
return; return;
} }
}
let session = self.session.lock().await.take(); let session = self.session.lock().await.take();
let timeout = Duration::from_secs(23 * 60); let timeout = Duration::from_secs(23 * 60);
@@ -999,14 +1013,16 @@ impl Imap {
return Some(ImapActionResult::RetryLater); return Some(ImapActionResult::RetryLater);
} }
} }
if self.select_folder(context, Some(&folder)).await == 0 { match self.select_folder(context, Some(&folder)).await {
ImapActionResult::Success | ImapActionResult::AlreadyDone => None,
res => {
warn!( warn!(
context, context,
"Cannot select folder {} for preparing IMAP operation", folder "Cannot select folder {} for preparing IMAP operation", folder
); );
Some(ImapActionResult::RetryLater)
} else { Some(res)
None }
} }
}) })
} }
@@ -1225,11 +1241,12 @@ impl Imap {
task::block_on(async move { task::block_on(async move {
info!(context, "emptying folder {}", folder); info!(context, "emptying folder {}", folder);
if folder.is_empty() || self.select_folder(context, Some(&folder)).await == 0 { if !folder.is_empty() {
warn!(context, "Cannot select folder '{}' for emptying", folder); warn!(context, "cannot perform empty, folder not set");
return; return;
} }
match self.select_folder(context, Some(&folder)).await {
ImapActionResult::Success | ImapActionResult::AlreadyDone => {
if !self if !self
.add_flag_finalized_with_set(context, SELECT_ALL, "\\Deleted") .add_flag_finalized_with_set(context, SELECT_ALL, "\\Deleted")
.await .await
@@ -1238,13 +1255,20 @@ impl Imap {
} else { } else {
// we now trigger expunge to actually delete messages // we now trigger expunge to actually delete messages
self.config.write().await.selected_folder_needs_expunge = true; self.config.write().await.selected_folder_needs_expunge = true;
if self.select_folder::<String>(context, None).await == 0 { if self.select_folder::<String>(context, None).await
== ImapActionResult::Success
{
emit_event!(context, Event::ImapFolderEmptied(folder.to_string()));
} else {
warn!( warn!(
context, context,
"could not perform expunge on empty-marked folder {}", folder "could not perform expunge on empty-marked folder {}", folder
); );
} else { }
emit_event!(context, Event::ImapFolderEmptied(folder.to_string())); }
}
ImapActionResult::Failed | ImapActionResult::RetryLater => {
warn!(context, "could not select folder {}", folder);
} }
} }
}); });