Centralize logging

[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 acbab82ca026d8306472d9922517f70f41ba246c..2b5df8e3d70f2fe9158537e372e28999f331c89c 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
 use super::Middleware;
 
 /// `MailDrop` can't find folders to sync because it implements `IMAPv3` and


@@ -22,9 +20,8 @@ impl Middleware for FindMailboxesCompatibility {
         if command.contains("FIND MAILBOXES /*") {
             if let Some(tag) = command.split("FIND MAILBOXES /*").next() {
                 // We'll need to convert the LIST to a FIND
         if command.contains("FIND MAILBOXES /*") {
             if let Some(tag) = command.split("FIND MAILBOXES /*").next() {
                 // We'll need to convert the LIST to a FIND

-                self.tags.push(tag.to_string());
+                self.tags.push(tag.trim().to_string());

                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());
                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());

-                debug!("### {replacement}");

                 return replacement.into_bytes();
             }
         }
                 return replacement.into_bytes();
             }
         }


@@ -54,7 +51,7 @@ impl Middleware for FindMailboxesCompatibility {
                 // Transform IMAPv4 "* LIST" lines to IMAPv3 "* MAILBOX"
                 if line.starts_with("* LIST") {
                     if let Some(last_slash_pos) = line.rfind('/') {
                 // 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();
+                        let mailbox_name = line[(last_slash_pos + 2)..].trim();

                         return Some(format!("* MAILBOX {mailbox_name}\r"));
                     }
                 }
                         return Some(format!("* MAILBOX {mailbox_name}\r"));
                     }
                 }