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

merge JobThread::connect_to_imap with Imap::connect_configured for simplicity

Browse Source
This commit is contained in:
holger krekel
2019-11-19 23:00:28 +01:00
parent a30fa710ad
commit 34c766dc2b
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/imap.rs
View File

@@ -295,6 +295,14 @@ impl Imap {
// the trailing underscore is correct // the trailing underscore is correct
if self.connect(context, &param) { if self.connect(context, &param) {
if context
.sql
.get_raw_config_int(context, "folders_configured")
.unwrap_or_default()
< 3
{
self.configure_folders(context, 0x1);
}
return Ok(()); return Ok(());
} }
return Err(Error::ImapConnectionFailed( return Err(Error::ImapConnectionFailed(
@@ -1069,8 +1077,7 @@ impl Imap {
// TODO: make INBOX/SENT/MVBOX perform the jobs on their // TODO: make INBOX/SENT/MVBOX perform the jobs on their
// respective folders to avoid select_folder network traffic // respective folders to avoid select_folder network traffic
// and the involved error states // and the involved error states
let inbox_thread = context.inbox_thread.read().unwrap(); if let Err(err) = self.connect_configured(context) {
if let Err(err) = inbox_thread.connect_to_imap(context) {
warn!(context, "prepare_imap_op failed: {}", err); warn!(context, "prepare_imap_op failed: {}", err);
return Some(ImapActionResult::RetryLater); return Some(ImapActionResult::RetryLater);
} }

23
src/job_thread.rs
View File

@@ -1,7 +1,7 @@
use std::sync::{Arc, Condvar, Mutex}; use std::sync::{Arc, Condvar, Mutex};
use crate::context::Context; use crate::context::Context;
use crate::error::{Error, Result}; use crate::error::Error;
use crate::imap::Imap; use crate::imap::Imap;
#[derive(Debug)] #[derive(Debug)]
@@ -86,7 +86,7 @@ impl JobThread {
if use_network { if use_network {
let prefix = format!("{}-fetch", self.name); let prefix = format!("{}-fetch", self.name);
match self.connect_to_imap(context) { match self.imap.connect_configured(context) {
Ok(()) => { Ok(()) => {
if let Some(watch_folder) = self.get_watch_folder(context) { if let Some(watch_folder) = self.get_watch_folder(context) {
let start = std::time::Instant::now(); let start = std::time::Instant::now();
@@ -102,7 +102,7 @@ impl JobThread {
if let Err(err) = res { if let Err(err) = res {
warn!(context, "fetch failed: {}, reconnect & retry", err); warn!(context, "fetch failed: {}, reconnect & retry", err);
self.imap.trigger_reconnect(); self.imap.trigger_reconnect();
match self.connect_to_imap(context) { match self.imap.connect_configured(context) {
Ok(()) => { Ok(()) => {
if let Err(err) = self.imap.fetch(context, &watch_folder) { if let Err(err) = self.imap.fetch(context, &watch_folder) {
error!(context, "fetch failed: {}", err); error!(context, "fetch failed: {}", err);
@@ -141,21 +141,6 @@ impl JobThread {
} }
} }
pub fn connect_to_imap(&self, context: &Context) -> Result<()> {
self.imap.connect_configured(context)?;
if context
.sql
.get_raw_config_int(context, "folders_configured")
.unwrap_or_default()
< 3
{
self.imap.configure_folders(context, 0x1);
}
Ok(())
}
pub fn idle(&self, context: &Context, use_network: bool) { pub fn idle(&self, context: &Context, use_network: bool) {
{ {
let &(ref lock, ref cvar) = &*self.state.clone(); let &(ref lock, ref cvar) = &*self.state.clone();
@@ -193,7 +178,7 @@ impl JobThread {
} }
let prefix = format!("{}-IDLE", self.name); let prefix = format!("{}-IDLE", self.name);
let do_fake_idle = match self.connect_to_imap(context) { let do_fake_idle = match self.imap.connect_configured(context) {
Ok(()) => { Ok(()) => {
info!(context, "{} started...", prefix); info!(context, "{} started...", prefix);
let watch_folder = self.get_watch_folder(context); let watch_folder = self.get_watch_folder(context);