From 48c58a711e132ba668577fe7079e14c05c642302 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Sun, 14 Feb 2021 10:55:51 +0100 Subject: [PATCH] scan_folders() bugfix: Don't exclude watched folders from being set as sent/spam folder This does fix a bug and it makes the tests pass, but I'm not sure why it makes the tests pass; maybe there is a race condition that made the tests fail and my commit just leads to another timing. --- src/imap/scan_folders.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/imap/scan_folders.rs b/src/imap/scan_folders.rs index 8f88f1a60..248970091 100644 --- a/src/imap/scan_folders.rs +++ b/src/imap/scan_folders.rs @@ -44,15 +44,6 @@ impl Imap { }; let foldername = folder.name(); - if watched_folders.contains(&foldername.to_string()) { - info!( - context, - "Not scanning folder {} as it is watched anyway", foldername - ); - continue; - } - info!(context, "Scanning folder: {}", foldername); - let folder_meaning = get_folder_meaning(&folder); let folder_name_meaning = get_folder_meaning_by_name(foldername); @@ -70,8 +61,17 @@ impl Imap { spam_folder = Some(folder.name().to_string()); } - if let Err(e) = self.fetch_new_messages(context, foldername, false).await { - warn!(context, "Can't fetch new msgs in scanned folder: {:#}", e); + if watched_folders.contains(&foldername.to_string()) { + info!( + context, + "Not scanning folder {} as it is watched anyway", foldername + ); + } else { + info!(context, "Scanning folder: {}", foldername); + + if let Err(e) = self.fetch_new_messages(context, foldername, false).await { + warn!(context, "Can't fetch new msgs in scanned folder: {:#}", e); + } } }