chore: Release

Cargo.lock

@@ -3034,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.12"
+version = "0.17.17"
 dependencies = [
  "itertools",
  "log",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.12"
+version = "0.17.17"
 dependencies = [
  "anyhow",
  "clap",
@@ -3062,7 +3062,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.12"
+version = "0.17.17"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3080,8 +3080,8 @@ dependencies = [
  "futures 0.3.31",
  "headers",
  "html-escape",
- "letterbox-notmuch 0.17.12",
- "letterbox-shared 0.17.12",
+ "letterbox-notmuch 0.17.17",
+ "letterbox-shared 0.17.17",
  "linkify",
  "log",
  "lol_html",
@@ -3121,10 +3121,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.12"
+version = "0.17.17"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.17.12",
+ "letterbox-notmuch 0.17.17",
  "regex",
  "serde",
  "sqlx",
@@ -3134,7 +3134,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.12"
+version = "0.17.17"
 dependencies = [
  "build-info",
  "build-info-build",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.17.12"
+version = "0.17.17"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

server/Cargo.toml

@@ -27,8 +27,8 @@ css-inline = "0.14.4"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.12", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.12", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.17", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.17", registry = "xinu" }
 linkify = "0.10.0"
 log = "0.4.27"
 lol_html = "2.3.0"

server/src/bin/letterbox-server.rs

@@ -200,15 +200,21 @@ async fn send_refresh_websocket_handler(
         None => Some(10),
     };
 
-    if let Err(err) = label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await {
-        error!("Failed to label_unprocessed: {err:?}");
+    let mut ids = None;
+    match label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await {
+        Ok(i) => ids = Some(i),
+        Err(err) => error!("Failed to label_unprocessed: {err:?}"),
     };
     connection_tracker
         .lock()
         .await
         .send_message_all(WebsocketMessage::RefreshMessages)
         .await;
-    "refresh triggered"
+    if let Some(ids) = ids {
+        format!("{ids:?}")
+    } else {
+        "refresh triggered".to_string()
+    }
 }
 
 async fn watch_new(

server/src/nm.rs

@@ -9,7 +9,7 @@ use log::{error, info, warn};
 use mailparse::{parse_content_type, parse_mail, MailHeader, MailHeaderMap, ParsedMail};
 use memmap::MmapOptions;
 use sqlx::{types::Json, PgPool};
-use tracing::instrument;
+use tracing::{info_span, instrument};
 
 use crate::{
     compute_offset_limit,
@@ -946,7 +946,7 @@ pub async fn label_unprocessed(
     dryrun: bool,
     limit: Option<usize>,
     query: &str,
-) -> Result<(), ServerError> {
+) -> Result<Box<[String]>, ServerError> {
     use futures::StreamExt;
     let ids = nm.message_ids(query)?;
     info!(
@@ -990,8 +990,9 @@ pub async fn label_unprocessed(
         // Only process the first file path is multiple files have the same id
         let path = files.iter().next().unwrap();
         let file = File::open(&path)?;
+        info!("parsing {path}");
         let mmap = unsafe { MmapOptions::new().map(&file)? };
-        let m = parse_mail(&mmap)?;
+        let m = info_span!("parse_mail", path = path).in_scope(|| parse_mail(&mmap))?;
         let (matched_rule, add_tags) = find_tags(&rules, &m.headers);
         if matched_rule {
             if dryrun {
@@ -1036,11 +1037,6 @@ pub async fn label_unprocessed(
                     .or_insert_with(|| Vec::new())
                     .push(id.clone());
             }
-            let t = "unprocessed".to_string();
-            rm_mutations
-                .entry(t)
-                .or_insert_with(|| Vec::new())
-                .push(id.clone());
             //nm.tag_remove("inbox", &id)?;
             let t = "inbox".to_string();
             rm_mutations
@@ -1048,25 +1044,32 @@ pub async fn label_unprocessed(
                 .or_insert_with(|| Vec::new())
                 .push(id.clone());
         }
+        let t = "unprocessed".to_string();
+        rm_mutations
+            .entry(t)
+            .or_insert_with(|| Vec::new())
+            .push(id.clone());
     }
-    println!("Adding {} distinct labels", add_mutations.len());
+    info!("Adding {} distinct labels", add_mutations.len());
     for (tag, ids) in add_mutations.iter() {
-        println!("  {tag}: {}", ids.len());
+        info!("  {tag}: {}", ids.len());
         if !dryrun {
             let ids: Vec<_> = ids.iter().map(|s| s.as_str()).collect();
-            nm.tags_add(tag, &ids)?;
+            info_span!("tags_add", tag = tag, count = ids.len())
+                .in_scope(|| nm.tags_add(tag, &ids))?;
         }
     }
-    println!("Removing {} distinct labels", rm_mutations.len());
+    info!("Removing {} distinct labels", rm_mutations.len());
     for (tag, ids) in rm_mutations.iter() {
-        println!("  {tag}: {}", ids.len());
+        info!("  {tag}: {}", ids.len());
         if !dryrun {
             let ids: Vec<_> = ids.iter().map(|s| s.as_str()).collect();
-            nm.tags_remove(tag, &ids)?;
+            info_span!("tags_remove", tag = tag, count = ids.len())
+                .in_scope(|| nm.tags_remove(tag, &ids))?;
         }
     }
 
-    Ok(())
+    Ok(ids.into())
 }
 fn find_tags<'a, 'b>(rules: &'a [Rule], headers: &'b [MailHeader]) -> (bool, HashSet<&'a str>) {
     let mut matched_rule = false;

shared/Cargo.toml

@@ -12,7 +12,7 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.12", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.17", registry = "xinu" }
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"