♻️ refactor(processor): simplify trash_messages function
- move label adding logic to GmailClient - remove Trash struct and use GmailClient directly
This commit is contained in:
committed by
Jeremiah Russell
parent
1af61d0ed0
commit
e45d6cdb9e
@@ -3,8 +3,8 @@
|
|||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
EolAction, Error, GmailClient, Result, Trash, config::EolRule, delete::Delete,
|
EolAction, Error, GmailClient, Result, config::EolRule, delete::Delete,
|
||||||
message_list::MessageList,
|
message_list::MessageList, trash::Trash,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Rule processor
|
/// Rule processor
|
||||||
@@ -74,28 +74,24 @@ impl<'a> Processor<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Trash the messages
|
/// Trash the messages
|
||||||
pub async fn trash_messages(&self, label: &str) -> Result<()> {
|
pub async fn trash_messages(&mut self, label: &str) -> Result<()> {
|
||||||
let mut messages_to_trash = Trash::new(&self.client).await?;
|
self.client.add_labels(&[label.to_string()]).await?;
|
||||||
messages_to_trash
|
|
||||||
.message_list()
|
|
||||||
.add_labels(&[label.to_string()])
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
if messages_to_trash.message_list().label_ids().is_empty() {
|
if self.client.label_ids().is_empty() {
|
||||||
return Err(Error::LabelNotFoundInMailbox(label.to_string()));
|
return Err(Error::LabelNotFoundInMailbox(label.to_string()));
|
||||||
}
|
}
|
||||||
|
|
||||||
let Some(query) = self.rule.eol_query() else {
|
let Some(query) = self.rule.eol_query() else {
|
||||||
return Err(Error::NoQueryStringCalculated(self.rule.id()));
|
return Err(Error::NoQueryStringCalculated(self.rule.id()));
|
||||||
};
|
};
|
||||||
messages_to_trash.message_list().set_query(&query);
|
self.client.set_query(&query);
|
||||||
|
|
||||||
log::info!("{messages_to_trash:?}");
|
log::info!("{:?}", self.client.messages());
|
||||||
log::info!("Ready to run");
|
log::info!("Ready to run");
|
||||||
messages_to_trash.prepare(0).await?;
|
self.client.prepare(0).await?;
|
||||||
if self.execute {
|
if self.execute {
|
||||||
log::info!("***executing final delete messages***");
|
log::info!("***executing final delete messages***");
|
||||||
messages_to_trash.batch_trash().await
|
self.client.batch_trash().await
|
||||||
} else {
|
} else {
|
||||||
log::warn!("Execution stopped for dry run");
|
log::warn!("Execution stopped for dry run");
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
Reference in New Issue
Block a user