meli/accounts: add mailbox_by_path() tests

epilys · epilys · commit de65eec3a9b4 · 2024-11-28T14:19:10.000+02:00
Signed-off-by: Manos Pitsidianakis &lt;manos@pitsidianak.is&gt;
diff --git a/meli/src/accounts.rs b/meli/src/accounts.rs
@@ -1337,16 +1337,23 @@ impl Account {
                 .list_mailboxes()
                 .into_iter()
                 .map(|n| (n.hash, n.depth))
-                .collect::<BTreeMap<MailboxHash, usize>>();
+                .collect::<IndexMap<MailboxHash, usize>>();
             let mut entries = self
                 .mailbox_entries
                 .iter()
-                .map(|(h, f)| (h, f.ref_mailbox.path()))
+                .map(|(h, f)| (h, f.ref_mailbox.name(), f.ref_mailbox.path()))
                 .collect::<Vec<_>>();
-            entries.sort_by_cached_key(|(h, _)| nodes.get(h).cloned().unwrap_or(usize::MAX));
+            entries.sort_by_cached_key(|(h, n, p)| {
+                (
+                    n.len(),
+                    nodes.get(*h).cloned().unwrap_or(usize::MAX),
+                    *p,
+                    *n,
+                )
+            });
             let patterns = &[path.trim_matches('/')];
             let mut potential_matches = IndexSet::new();
-            for (_, haystack) in entries {
+            for (_, _, haystack) in &entries {
                 let ac = AhoCorasick::builder()
                     .ascii_case_insensitive(true)
                     .build(patterns)
diff --git a/meli/src/accounts/mailbox_ops.rs b/meli/src/accounts/mailbox_ops.rs
@@ -26,7 +26,7 @@ use super::*;
 use crate::command::actions::MailboxOperation;
 
 impl Account {
-    pub fn mailbox_operation(&mut self, op: MailboxOperation) -> Result<()> {
+    pub fn mailbox_operation(&mut self, op: MailboxOperation) -> Result<JobId> {
         if self.settings.account.read_only {
             return Err(Error::new("Account is read-only."));
         }
@@ -42,11 +42,12 @@ impl Account {
                     job,
                     self.is_async(),
                 );
+                let job_id = handle.job_id;
                 self.insert_job(
                     handle.job_id,
                     JobRequest::Mailbox(MailboxJobRequest::CreateMailbox { path, handle }),
                 );
-                Ok(())
+                Ok(job_id)
             }
             MailboxOperation::Delete(path) => {
                 if self.mailbox_entries.len() == 1 {
@@ -60,14 +61,15 @@ impl Account {
                     job,
                     self.is_async(),
                 );
+                let job_id = handle.job_id;
                 self.insert_job(
                     handle.job_id,
                     JobRequest::Mailbox(MailboxJobRequest::DeleteMailbox {
                         mailbox_hash,
                         handle,
                     }),
                 );
-                Ok(())
+                Ok(job_id)
             }
             MailboxOperation::Subscribe(path) => {
                 let mailbox_hash = self.mailbox_by_path(&path)?;
@@ -81,6 +83,7 @@ impl Account {
                     job,
                     self.is_async(),
                 );
+                let job_id = handle.job_id;
                 self.insert_job(
                     handle.job_id,
                     JobRequest::Mailbox(MailboxJobRequest::SetMailboxSubscription {
@@ -89,7 +92,7 @@ impl Account {
                         handle,
                     }),
                 );
-                Ok(())
+                Ok(job_id)
             }
             MailboxOperation::Unsubscribe(path) => {
                 let mailbox_hash = self.mailbox_by_path(&path)?;
@@ -103,15 +106,16 @@ impl Account {
                     job,
                     self.is_async(),
                 );
+                let job_id = handle.job_id;
                 self.insert_job(
-                    handle.job_id,
+                    job_id,
                     JobRequest::Mailbox(MailboxJobRequest::SetMailboxSubscription {
                         mailbox_hash,
                         new_value: false,
                         handle,
                     }),
                 );
-                Ok(())
+                Ok(job_id)
             }
             MailboxOperation::Rename(path, new_path) => {
                 let mailbox_hash = self.mailbox_by_path(&path)?;
@@ -125,15 +129,16 @@ impl Account {
                     job,
                     self.is_async(),
                 );
+                let job_id = handle.job_id;
                 self.insert_job(
-                    handle.job_id,
+                    job_id,
                     JobRequest::Mailbox(MailboxJobRequest::RenameMailbox {
                         handle,
                         mailbox_hash,
                         new_path,
                     }),
                 );
-                Ok(())
+                Ok(job_id)
             }
             MailboxOperation::SetPermissions(_) => Err(Error::new("Not implemented.")),
         }
diff --git a/meli/src/accounts/tests.rs b/meli/src/accounts/tests.rs
