From 8ef0ea8aea4a8a0d66ea66d0a49c3582c84dcb40 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 19 Nov 2019 23:14:13 +0100
Subject: [PATCH] simplify double-fetching

---
 python/tests/test_account.py  |  2 +-
 python/tests/test_lowlevel.py |  2 +-
 src/imap.rs                   |  6 ++--
 src/job_thread.rs             | 64 ++++++++++++++---------------------
 4 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/python/tests/test_account.py b/python/tests/test_account.py
index d9070f54d..3580036c1 100644
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -431,7 +431,7 @@ class TestOnlineAccount:
         ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
 
     def test_mvbox_sentbox_threads(self, acfactory, lp):
-        lp.sec("ac1: start with mvbox/sentbox threads")
+        lp.sec("ac1: start with mvbox thread")
         ac1 = acfactory.get_online_configuring_account(mvbox=True, sentbox=True)
 
         lp.sec("ac2: start without mvbox/sentbox threads")
diff --git a/python/tests/test_lowlevel.py b/python/tests/test_lowlevel.py
index a472458f1..915631895 100644
--- a/python/tests/test_lowlevel.py
+++ b/python/tests/test_lowlevel.py
@@ -41,7 +41,7 @@ def test_dc_close_events(tmpdir):
             else:
                 print("skipping event", *ev)
 
-    find("disconnecting INBOX-watch")
+    find("disconnecting inbox-thread")
     find("disconnecting sentbox-thread")
     find("disconnecting mvbox-thread")
     find("disconnecting SMTP")
diff --git a/src/imap.rs b/src/imap.rs
index 9a295cd68..4dd4ba71b 100644
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -866,7 +866,8 @@ impl Imap {
     }
 
     pub(crate) fn fake_idle(&self, context: &Context, watch_folder: Option<String>) {
-        // Idle using polling.
+        // Idle using polling. This is also needed if we're not yet configured -
+        // in this case, we're waiting for a configure job (and an interrupt).
         task::block_on(async move {
             let fake_idle_start_time = SystemTime::now();
 
@@ -1072,7 +1073,8 @@ impl Imap {
         task::block_on(async move {
             if uid == 0 {
                 return Some(ImapActionResult::Failed);
-            } else if !self.is_connected().await {
+            }
+            if !self.is_connected().await {
                 // currently jobs are only performed on the INBOX thread
                 // TODO: make INBOX/SENT/MVBOX perform the jobs on their
                 // respective folders to avoid select_folder network traffic
diff --git a/src/job_thread.rs b/src/job_thread.rs
index 2416faff5..c5f5aabb5 100644
--- a/src/job_thread.rs
+++ b/src/job_thread.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Condvar, Mutex};
 
 use crate::context::Context;
-use crate::error::Error;
+use crate::error::{Error, Result};
 use crate::imap::Imap;
 
 #[derive(Debug)]
@@ -85,48 +85,37 @@ impl JobThread {
         }
 
         if use_network {
-            let prefix = format!("{}-fetch", self.name);
-            match self.imap.connect_configured(context) {
-                Ok(()) => {
-                    if let Some(watch_folder) = self.get_watch_folder(context) {
-                        let start = std::time::Instant::now();
-                        info!(context, "{} started...", prefix);
-                        let res = self.imap.fetch(context, &watch_folder);
-                        info!(
-                            context,
-                            "{} done in {:.3} ms.",
-                            prefix,
-                            start.elapsed().as_millis(),
-                        );
-
-                        if let Err(err) = res {
-                            warn!(context, "fetch failed: {}, reconnect & retry", err);
-                            self.imap.trigger_reconnect();
-                            match self.imap.connect_configured(context) {
-                                Ok(()) => {
-                                    if let Err(err) = self.imap.fetch(context, &watch_folder) {
-                                        error!(context, "fetch failed: {}", err);
-                                    }
-                                }
-                                Err(err) => {
-                                    error!(context, "connect failed: {}", err);
-                                }
-                            }
-                        }
-                    }
-                }
-                Err(err) => {
-                    warn!(
-                        context,
-                        "{} skipped, could not connect to imap {:?}", prefix, err
-                    );
+            if let Err(err) = self.connect_and_fetch(context) {
+                warn!(context, "connect+fetch failed: {}, reconnect & retry", err);
+                self.imap.trigger_reconnect();
+                if let Err(err) = self.connect_and_fetch(context) {
+                    warn!(context, "connect+fetch failed: {}", err);
                 }
             }
         }
-
         self.state.0.lock().unwrap().using_handle = false;
     }
 
+    fn connect_and_fetch(&mut self, context: &Context) -> Result<()> {
+        let prefix = format!("{}-fetch", self.name);
+        match self.imap.connect_configured(context) {
+            Ok(()) => {
+                if let Some(watch_folder) = self.get_watch_folder(context) {
+                    let start = std::time::Instant::now();
+                    info!(context, "{} started...", prefix);
+                    let res = self.imap.fetch(context, &watch_folder);
+                    let elapsed = start.elapsed().as_millis();
+                    info!(context, "{} done in {:.3} ms.", prefix, elapsed);
+
+                    res
+                } else {
+                    Err(Error::WatchFolderNotFound("not-set".to_string()))
+                }
+            }
+            Err(err) => Err(err),
+        }
+    }
+
     fn get_watch_folder(&self, context: &Context) -> Option<String> {
         match context.sql.get_raw_config(context, self.folder_config_name) {
             Some(name) => Some(name),
@@ -201,7 +190,6 @@ impl JobThread {
                 // if the connection fails, use fake_idle to retry periodically
                 // fake_idle() will be woken up by interrupt_idle() as
                 // well so will act on maybe_network events
-                //
                 true
             }
         };