feat(message_list): add message_ids to MessageList struct

- add message_ids field to store message IDs
- update run method to populate message_ids
- create messages_list method for API calls
- create log_message_subjects method to log message subjects
This commit is contained in:
Jeremiah Russell
2025-10-06 06:47:43 +01:00
committed by Jeremiah Russell
parent 215a2218c4
commit 0a528b4196

View File

@@ -19,6 +19,7 @@ pub struct MessageList {
hub: Gmail<HttpsConnector<HttpConnector>>, hub: Gmail<HttpsConnector<HttpConnector>>,
max_results: u32, max_results: u32,
label_ids: Vec<String>, label_ids: Vec<String>,
message_ids: Vec<String>,
query: String, query: String,
} }
@@ -56,6 +57,7 @@ impl MessageList {
hub: Gmail::new(client, auth), hub: Gmail::new(client, auth),
max_results: DEFAULT_MAX_RESULTS.parse::<u32>().unwrap(), max_results: DEFAULT_MAX_RESULTS.parse::<u32>().unwrap(),
label_ids: Vec::new(), label_ids: Vec::new(),
message_ids: Vec::new(),
query: String::new(), query: String::new(),
}) })
} }
@@ -85,18 +87,8 @@ impl MessageList {
} }
/// Run the Gmail api as configured /// Run the Gmail api as configured
pub async fn run(&self, pages: u32) -> Result<(), Error> { pub async fn run(&mut self, pages: u32) -> Result<(), Error> {
let log_estimate = |est: &Option<u32>| { let list = self.messages_list(None).await?;
if let Some(estimate) = est {
log::debug!("Estimated {estimate} messages in total.");
} else {
log::debug!("Unknown number of messages found");
}
};
let list = self.get_messages(None).await?;
log_estimate(&list.result_size_estimate);
self.log_message_subjects(&list).await?;
match pages { match pages {
1 => {} 1 => {}
0 => { 0 => {
@@ -105,33 +97,35 @@ impl MessageList {
loop { loop {
page += 1; page += 1;
log::debug!("Processing page #{page}"); log::debug!("Processing page #{page}");
log_estimate(&list.result_size_estimate);
if list.next_page_token.is_none() { if list.next_page_token.is_none() {
break; break;
} }
list = self.get_messages(list.next_page_token).await?; list = self.messages_list(list.next_page_token).await?;
self.log_message_subjects(&list).await?; // self.log_message_subjects(&list).await?;
} }
} }
_ => { _ => {
let mut list = list; let mut list = list;
for page in 2..=pages { for page in 2..=pages {
log::debug!("Processing page #{page}"); log::debug!("Processing page #{page}");
log_estimate(&list.result_size_estimate);
if list.next_page_token.is_none() { if list.next_page_token.is_none() {
break; break;
} }
list = self.get_messages(list.next_page_token).await?; list = self.messages_list(list.next_page_token).await?;
self.log_message_subjects(&list).await?; // self.log_message_subjects(&list).await?;
} }
} }
} }
if log::max_level() <= log::Level::Info {
self.log_message_subjects().await?;
}
Ok(()) Ok(())
} }
async fn get_messages( async fn messages_list(
&self, &mut self,
next_page_token: Option<String>, next_page_token: Option<String>,
) -> Result<ListMessagesResponse, Error> { ) -> Result<ListMessagesResponse, Error> {
let mut call = self let mut call = self
@@ -159,16 +153,20 @@ impl MessageList {
let (_response, list) = call.doit().await.map_err(Box::new)?; let (_response, list) = call.doit().await.map_err(Box::new)?;
let mut list_ids: Vec<String> = list
.clone()
.messages
.unwrap()
.iter()
.map(|item| item.id.clone().unwrap())
.collect();
self.message_ids.append(&mut list_ids);
Ok(list) Ok(list)
} }
async fn log_message_subjects(&self, list: &ListMessagesResponse) -> Result<(), Error> { async fn log_message_subjects(&self) -> Result<(), Error> {
let Some(messages) = &list.messages else { for id in &self.message_ids {
return Ok(());
};
for message in messages {
let Some(id) = &message.id else { continue };
log::trace!("{id}"); log::trace!("{id}");
let (_res, m) = self let (_res, m) = self
.hub .hub