Compare commits

...

3 Commits

Author SHA1 Message Date
fa5aac34ba chore: Release
All checks were successful
Continuous integration / Check (push) Successful in 38s
Continuous integration / Test Suite (push) Successful in 44s
Continuous integration / Rustfmt (push) Successful in 31s
Continuous integration / Trunk (push) Successful in 55s
Continuous integration / build (push) Successful in 51s
Continuous integration / Disallow unused dependencies (push) Successful in 2m7s
2025-04-24 12:03:13 -07:00
b58556254e notmuch: log any stderr output 2025-04-24 12:02:55 -07:00
e365ced7dd server: more concise slice of ids 2025-04-24 12:02:40 -07:00
6 changed files with 24 additions and 20 deletions

16
Cargo.lock generated
View File

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

View File

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

View File

@ -214,9 +214,8 @@ use std::{
process::Command, process::Command,
}; };
use log::{error, info};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::instrument; use tracing::{error, info, instrument, warn};
/// # Number of seconds since the Epoch /// # Number of seconds since the Epoch
pub type UnixTime = isize; pub type UnixTime = isize;
@ -718,6 +717,13 @@ impl Notmuch {
cmd.args(args); cmd.args(args);
info!("{:?}", &cmd); info!("{:?}", &cmd);
let out = cmd.output()?; let out = cmd.output()?;
if !out.stderr.is_empty() {
warn!(
"{:?}: STDERR:\n{}",
&cmd,
String::from_utf8_lossy(&out.stderr)
);
}
Ok(out.stdout) Ok(out.stdout)
} }
} }

View File

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

View File

@ -976,12 +976,10 @@ pub async fn label_unprocessed(
*/ */
info!("Loaded {} rules", rules.len()); info!("Loaded {} rules", rules.len());
let ids = if let Some(limit) = limit { let limit = limit.unwrap_or(ids.len());
let limit = limit.min(ids.len()); let limit = limit.min(ids.len());
&ids[..limit] let ids = &ids[..limit];
} else {
&ids[..]
};
let mut add_mutations = HashMap::new(); let mut add_mutations = HashMap::new();
let mut rm_mutations = HashMap::new(); let mut rm_mutations = HashMap::new();
for id in ids { for id in ids {

View File

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