From bd4aa439ad1f17a06912aa9be0d9c5ebe461d586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rob=20N=20=E2=98=85?= <robn@despairlabs.com>
Date: Sun, 14 Aug 2022 15:35:21 +1000
Subject: [PATCH] sync: redownload messages that disappear from the maildir

If we detect a message that exists in notmuch, exists on the server, but
is not in the maildir, treat it a little like a "new" message and
redownload it from the server.
---
 src/local.rs |  4 ++++
 src/sync.rs  | 26 +++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/local.rs b/src/local.rs
index 4ffb659..0433621 100644
--- a/src/local.rs
+++ b/src/local.rs
@@ -305,4 +305,8 @@ impl Local {
         }
         Ok(())
     }
+
+    pub fn email_exists_on_disk(&self, email: &Email) -> bool {
+        email.path.exists()
+    }
 }
diff --git a/src/sync.rs b/src/sync.rs
index 992f37b..8c9f468 100644
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -281,22 +281,29 @@ pub fn sync(
         })
         .unwrap_or_else(|| full_sync(&mut remote))?;
 
+    // Get ids for any emails we think are in the maildir but are not
+    let missing_ids: HashSet<jmap::Id> = local_emails.values().filter(|e| !local.email_exists_on_disk(e)).map(|e| e.id.clone()).collect();
+
     // Retrieve the updated `Email` objects from the server.
     stdout.set_color(&info_color_spec).context(LogSnafu {})?;
     write!(stdout, "Retrieving metadata...").context(LogSnafu {})?;
     stdout.reset().context(LogSnafu {})?;
-    writeln!(stdout, " ({} possibly changed)", updated_ids.len()).context(LogSnafu {})?;
+    write!(stdout, " ({} possibly changed)", updated_ids.len()).context(LogSnafu {})?;
+    if !missing_ids.is_empty() {
+        write!(stdout, " ({} lost)", missing_ids.len()).context(LogSnafu {})?
+    }
+    writeln!(stdout, "").context(LogSnafu {})?;
     stdout.flush().context(LogSnafu {})?;
 
     let remote_emails = remote
-        .get_emails(updated_ids.iter(), &mailboxes, &config.tags)
+        .get_emails([updated_ids, missing_ids.clone()].iter().flatten(), &mailboxes, &config.tags)
         .context(GetRemoteEmailsSnafu {})?;
 
     // Before merging, download the new files into the cache.
     let mut new_emails: HashMap<jmap::Id, NewEmail> = remote_emails
         .values()
         .filter(|remote_email| match local_emails.get(&remote_email.id) {
-            Some(local_email) => local_email.blob_id != remote_email.blob_id,
+            Some(local_email) => local_email.blob_id != remote_email.blob_id || !local.email_exists_on_disk(local_email),
             None => true,
         })
         .map(|remote_email| {
@@ -310,10 +317,13 @@ pub fn sync(
             )
         })
         .collect();
-
+    
     let new_emails_missing_from_cache: Vec<&NewEmail> = new_emails
         .values()
-        .filter(|x| !x.cache_path.exists() && !local_emails.contains_key(&x.remote_email.id))
+        .filter(|x| match local_emails.get(&x.remote_email.id) {
+            Some(le) => !local.email_exists_on_disk(le),
+            None => !x.cache_path.exists(),
+        })
         .collect();
 
     if !new_emails_missing_from_cache.is_empty() {
@@ -442,8 +452,10 @@ pub fn sync(
                         .add_new_email(&new_email)
                         .context(AddLocalEmailSnafu {})?;
                     if let Some(e) = local_emails.get(&new_email.remote_email.id) {
-                        // Move the old message to the destroyed emails set.
-                        destroyed_local_emails.push(e);
+                        // It already existed; delete old versions, but not ones we're reloading
+                        if !missing_ids.contains(&e.id) {
+                            destroyed_local_emails.push(e);
+                        }
                     }
                     Ok((local_email.id.clone(), local_email))
                 })