Split LINE and not COMMAND

[rbdr/olden-mail] / src / middleware / find_mailboxes_compatibility.rs

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index 0e4b2cdbcfbfe4e88c5c47bc92204c0571474127..51d7488b84b45c490a975c3227e20e2fc5449e66 100644 (file)
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -1,5 +1,3 @@
-use log::debug;
-
 use super::Middleware;
 
 /// `MailDrop` can't find folders to sync because it implements `IMAPv3` and
@@ -24,7 +22,6 @@ impl Middleware for FindMailboxesCompatibility {
                 // We'll need to convert the LIST to a FIND
                 self.tags.push(tag.trim().to_string());
                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());
-                debug!("### {replacement}");
                 return replacement.into_bytes();
             }
         }
@@ -53,9 +50,15 @@ impl Middleware for FindMailboxesCompatibility {
 
                 // Transform IMAPv4 "* LIST" lines to IMAPv3 "* MAILBOX"
                 if line.starts_with("* LIST") {
-                    if let Some(last_slash_pos) = line.rfind('/') {
-                        let mailbox_name = line[(last_slash_pos + 1)..].trim();
-                        return Some(format!("* MAILBOX {mailbox_name}\r"));
+                    if let Some(last_slash_pos) = line.rfind("\"/\"") {
+                        let mailbox_name = line[(last_slash_pos + 3)..].replace('"', "");
+                        return Some(format!("* MAILBOX {}\r", mailbox_name.trim()));
+                    }
+                }
+
+                if line.contains("OK") {
+                    if let Some(tag) = line.split("OK").next() {
+                        return Some(format!("{} OK MAILBOX Completed.\r", tag.trim()).to_string());
                     }
                 }