aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-07-12 15:35:25 +0200
committerAlex Auvolat <alex@adnab.me>2022-07-12 15:35:25 +0200
commitfc2e25ce76c20a4d2e8316317c7303ae8d78b031 (patch)
tree55b0f4556df0de781fee63ef080945e6fa9d0c77
parent5d6e4f73322b26038e76e6f915c6c79c5f03566e (diff)
downloadaerogramme-fc2e25ce76c20a4d2e8316317c7303ae8d78b031.tar.gz
aerogramme-fc2e25ce76c20a4d2e8316317c7303ae8d78b031.zip
Clean up
-rw-r--r--src/imap/mailbox_view.rs5
-rw-r--r--src/imap/session.rs6
-rw-r--r--src/mail/incoming.rs1
-rw-r--r--src/mail/mailbox.rs50
4 files changed, 2 insertions, 60 deletions
diff --git a/src/imap/mailbox_view.rs b/src/imap/mailbox_view.rs
index a73bdf7..0adba18 100644
--- a/src/imap/mailbox_view.rs
+++ b/src/imap/mailbox_view.rs
@@ -47,9 +47,6 @@ impl MailboxView {
/// has a satisfactory summary of the current mailbox's state.
/// These are the messages that are sent in response to a SELECT command.
pub async fn new(mailbox: Arc<Mailbox>) -> Result<(Self, Vec<Body>)> {
- // TODO THIS IS JUST A TEST REMOVE LATER
- mailbox.test().await?;
-
let state = mailbox.current_uid_index().await;
let new_view = Self {
@@ -74,8 +71,6 @@ impl MailboxView {
/// responses describing the changes.
pub async fn sync_update(&mut self) -> Result<Vec<Body>> {
self.mailbox.sync().await?;
- // TODO THIS IS JUST A TEST REMOVE LATER
- self.mailbox.test().await?;
self.update().await
}
diff --git a/src/imap/session.rs b/src/imap/session.rs
index 9841cf8..622a3f6 100644
--- a/src/imap/session.rs
+++ b/src/imap/session.rs
@@ -72,12 +72,6 @@ impl Manager {
//-----
-pub struct InnerContext<'a> {
- pub req: &'a Request,
- pub state: &'a flow::State,
- pub login: &'a ArcLoginProvider,
-}
-
pub struct Instance {
rx: mpsc::Receiver<Message>,
diff --git a/src/mail/incoming.rs b/src/mail/incoming.rs
index f64b9f3..9643985 100644
--- a/src/mail/incoming.rs
+++ b/src/mail/incoming.rs
@@ -296,7 +296,6 @@ async fn k2v_lock_loop_internal(
}
}
}
- info!("Stopping lock state watch");
}
.boxed();
diff --git a/src/mail/mailbox.rs b/src/mail/mailbox.rs
index efe98fd..e80fa34 100644
--- a/src/mail/mailbox.rs
+++ b/src/mail/mailbox.rs
@@ -44,6 +44,8 @@ impl Mailbox {
.await?;
}
+ dump(&uid_index);
+
let mbox = RwLock::new(MailboxInternal {
id,
bucket: creds.bucket().to_string(),
@@ -153,13 +155,6 @@ impl Mailbox {
};
selflock.move_from(&mut fromlock, uuid).await
}
-
- // ----
-
- /// Test procedure TODO WILL REMOVE THIS
- pub async fn test(&self) -> Result<()> {
- self.mbox.write().await.test().await
- }
}
// ----
@@ -437,47 +432,6 @@ impl MailboxInternal {
Ok(())
}
-
- // ----
-
- async fn test(&mut self) -> Result<()> {
- Ok(())
-
- /*
- self.uid_index.sync().await?;
-
- dump(&self.uid_index);
-
- let mail = br#"From: Garage team <garagehq@deuxfleurs.fr>
- Subject: Welcome to Aerogramme!!
-
- This is just a test email, feel free to ignore.
- "#;
- let mail = IMF::try_from(&mail[..]).unwrap();
- self.append(mail, None).await?;
-
- dump(&self.uid_index);
-
- if self.uid_index.state().idx_by_uid.len() > 6 {
- for i in 0..2 {
- let (_, ident) = self
- .uid_index
- .state()
- .idx_by_uid
- .iter()
- .skip(3 + i)
- .next()
- .unwrap();
-
- self.delete(*ident).await?;
-
- dump(&self.uid_index);
- }
- }
-
- Ok(())
- */
- }
}
fn dump(uid_index: &Bayou<UidIndex>) {