From ac22d7bc96e46dab2618eee892bdb5db61b274dc Mon Sep 17 00:00:00 2001
From: MTRNord <mtrnord1@gmail.com>
Date: Fri, 28 Jul 2023 19:19:47 +0200
Subject: [PATCH] More cleanup and debugging

---
 crates/erooster_imap/src/commands/append.rs |  1 -
 crates/erooster_imap/src/commands/fetch.rs  | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/erooster_imap/src/commands/append.rs b/crates/erooster_imap/src/commands/append.rs
index 41513f99..fe902228 100644
--- a/crates/erooster_imap/src/commands/append.rs
+++ b/crates/erooster_imap/src/commands/append.rs
@@ -30,7 +30,6 @@ impl Append<'_> {
         S: Sink<String, Error = E> + std::marker::Unpin + std::marker::Send,
     {
         let mut write_lock = self.data.con_state.write().await;
-        debug!("Append command start");
         if matches!(write_lock.state, State::Authenticated)
             || matches!(write_lock.state, State::Selected(_, _))
         {
diff --git a/crates/erooster_imap/src/commands/fetch.rs b/crates/erooster_imap/src/commands/fetch.rs
index 5f31346e..c7c20743 100644
--- a/crates/erooster_imap/src/commands/fetch.rs
+++ b/crates/erooster_imap/src/commands/fetch.rs
@@ -78,9 +78,12 @@ impl Fetch<'_> {
                         })
                         .collect::<Vec<_>>();
 
-                    let fetch_args = command_data.arguments[1 + offset..].to_vec().join(" ");
+                    debug!("command_data.arguments: {:?}", command_data.arguments);
+                    let fetch_args: String =
+                        command_data.arguments[1 + offset..].to_vec().join(" ");
+                    debug!("fetch_args: {:?}", fetch_args);
                     let fetch_args_str = &fetch_args[1..fetch_args.len() - 1];
-                    debug!("Fetch args: {}", fetch_args_str);
+                    debug!("fetch_args_str: {:?}", fetch_args_str);
 
                     filtered_mails.sort_by_cached_key(|x| {
                         if let Some(number) = x.sequence_number() {
@@ -91,13 +94,10 @@ impl Fetch<'_> {
                     });
                     match fetch_arguments(fetch_args_str).finish() {
                         Ok((_, args)) => {
-                            debug!("Parsed Fetch args: {:?}", args);
-                            warn!("filtered_mails: {}", filtered_mails.len());
-                            for mut mail in filtered_mails {
+                            for mail in filtered_mails {
                                 let uid = mail.uid();
                                 let sequence =
                                     mail.sequence_number().context("Sequence number missing")?;
-                                warn!("Sequence: {sequence}; UID: {uid}; is_uid: {is_uid}");
                                 if let Some(resp) = generate_response(args.clone(), mail)? {
                                     if is_uid {
                                         // This deduplicates the UID command if needed