chore: Release

Cargo.lock

@@ -3034,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.10"
+version = "0.17.21"
 dependencies = [
  "itertools",
  "log",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.10"
+version = "0.17.21"
 dependencies = [
  "anyhow",
  "clap",
@@ -3062,7 +3062,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.10"
+version = "0.17.21"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3080,10 +3080,9 @@ dependencies = [
  "futures 0.3.31",
  "headers",
  "html-escape",
- "letterbox-notmuch 0.17.10",
- "letterbox-shared 0.17.10",
+ "letterbox-notmuch 0.17.21",
+ "letterbox-shared 0.17.21",
  "linkify",
- "log",
  "lol_html",
  "mailparse",
  "maplit",
@@ -3121,10 +3120,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.10"
+version = "0.17.21"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.17.10",
+ "letterbox-notmuch 0.17.21",
  "regex",
  "serde",
  "sqlx",
@@ -3134,7 +3133,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.10"
+version = "0.17.21"
 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.10"
+version = "0.17.21"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

server/Cargo.toml

@@ -27,10 +27,9 @@ 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.10", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.10", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.21", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.21", registry = "xinu" }
 linkify = "0.10.0"
-log = "0.4.27"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
 maplit = "1.0.2"

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/graphql.rs

@@ -9,11 +9,10 @@ use async_graphql::{
 use cacher::FilesystemCacher;
 use futures::stream;
 use letterbox_notmuch::Notmuch;
-use log::info;
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgPool;
 use tokio::join;
-use tracing::instrument;
+use tracing::{info, instrument};
 
 #[cfg(feature = "tantivy")]
 use crate::tantivy::TantivyConnection;

server/src/lib.rs

@@ -21,7 +21,6 @@ use cacher::{Cacher, FilesystemCacher};
 use css_inline::{CSSInliner, InlineError, InlineOptions};
 pub use error::ServerError;
 use linkify::{LinkFinder, LinkKind};
-use log::{debug, error, info, warn};
 use lol_html::{
     element, errors::RewritingError, html_content::ContentType, rewrite_str, text,
     RewriteStrSettings,
@@ -32,6 +31,7 @@ use reqwest::StatusCode;
 use scraper::{Html, Selector};
 use sqlx::types::time::PrimitiveDateTime;
 use thiserror::Error;
+use tracing::{debug, error, info, warn};
 use url::Url;
 
 use crate::{

server/src/newsreader.rs

@@ -3,11 +3,10 @@ use std::collections::HashMap;
 use cacher::FilesystemCacher;
 use futures::{stream::FuturesUnordered, StreamExt};
 use letterbox_shared::compute_color;
-use log::{error, info};
 use maplit::hashmap;
 use scraper::Selector;
 use sqlx::postgres::PgPool;
-use tracing::instrument;
+use tracing::{error, info, instrument};
 use url::Url;
 
 use crate::{

server/src/nm.rs

@@ -5,11 +5,10 @@ use std::{
 
 use letterbox_notmuch::Notmuch;
 use letterbox_shared::{compute_color, Rule};
-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::{error, info, info_span, instrument, warn};
 
 use crate::{
     compute_offset_limit,
@@ -946,7 +945,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!(
@@ -978,6 +977,7 @@ pub async fn label_unprocessed(
     info!("Loaded {} rules", rules.len());
 
     let ids = if let Some(limit) = limit {
+        let limit = limit.max(ids.len());
         &ids[..limit]
     } else {
         &ids[..]
@@ -988,10 +988,28 @@ pub async fn label_unprocessed(
         let id = format!("id:{id}");
         let files = nm.files(&id)?;
         // Only process the first file path is multiple files have the same id
-        let path = files.iter().next().unwrap();
+        let Some(path) = files.iter().next() else {
+            error!("No files for message-ID {id}");
+            let t = "Letterbox/Bad";
+            nm.tag_add(t, &id)?;
+            let t = "unprocessed";
+            nm.tag_remove(t, &id)?;
+            continue;
+        };
         let file = File::open(&path)?;
+        info!("parsing {path}");
         let mmap = unsafe { MmapOptions::new().map(&file)? };
-        let m = parse_mail(&mmap)?;
+        let m = match info_span!("parse_mail", path = path).in_scope(|| parse_mail(&mmap)) {
+            Ok(m) => m,
+            Err(err) => {
+                error!("Failed to parse {path}: {err}");
+                let t = "Letterbox/Bad";
+                nm.tag_add(t, &id)?;
+                let t = "unprocessed";
+                nm.tag_remove(t, &id)?;
+                continue;
+            }
+        };
         let (matched_rule, add_tags) = find_tags(&rules, &m.headers);
         if matched_rule {
             if dryrun {
@@ -1028,11 +1046,6 @@ pub async fn label_unprocessed(
                     .push(id.clone());
             }
             //nm.tag_remove("unprocessed", &id)?;
-            let t = "unprocessed".to_string();
-            rm_mutations
-                .entry(t)
-                .or_insert_with(|| Vec::new())
-                .push(id.clone());
         } else {
             if add_tags.is_empty() {
                 let t = "Grey".to_string();
@@ -1041,26 +1054,39 @@ pub async fn label_unprocessed(
                     .or_insert_with(|| Vec::new())
                     .push(id.clone());
             }
+            //nm.tag_remove("inbox", &id)?;
+            let t = "inbox".to_string();
+            rm_mutations
+                .entry(t)
+                .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.10", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.21", registry = "xinu" }
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"