diff options
Diffstat (limited to 'mail-overview')
| -rw-r--r-- | mail-overview/README.md | 2 | ||||
| -rwxr-xr-x | mail-overview/mail-notify.sh | 12 | ||||
| -rwxr-xr-x | mail-overview/test-mail-notify.sh | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/mail-overview/README.md b/mail-overview/README.md index 6e34140..7465ac1 100644 --- a/mail-overview/README.md +++ b/mail-overview/README.md @@ -123,7 +123,7 @@ local index. ## Notifications on arrival `mail-notify.sh` sends one notification per account when mail lands, with the -newest three senders and subjects and a `+N more` line when the batch is +newest three threads' sender and subject and a `+N more` line when the batch is bigger. Each message is a bullet on its own line with a blank line between, under a bold `New Mail` heading with the account and count as the second line. Started from `autostart.lua`, it runs for the whole session. diff --git a/mail-overview/mail-notify.sh b/mail-overview/mail-notify.sh index e6c9868..b132775 100755 --- a/mail-overview/mail-notify.sh +++ b/mail-overview/mail-notify.sh @@ -25,7 +25,7 @@ # # Usage: # mail-notify.sh watch forever (what autostart runs) -# mail-notify.sh --once process one tick and exit (what the test drives) +# mail-notify.sh --once process one tick and exit (for manual verification, one tick) set -u @@ -104,6 +104,7 @@ build_body() { rowtext="$(printf '%s' "$json" | jq -r ' .[] | "• " + ((.authors // "(unknown)") + " — " + (.subject // "(no subject)")) + | gsub("[\r\n]+"; " ") | gsub("&"; "&") | gsub("<"; "<") | gsub(">"; ">") ' 2>/dev/null)" || return 0 [[ -n "$rowtext" ]] || return 0 @@ -231,7 +232,7 @@ tick() { while IFS=$'\t' read -r key label; do [[ -n "$key" ]] || continue - query="$SCOPE and tag:account-$key and lastmod:$prev..$cur" + query="$SCOPE and tag:account-$key and lastmod:$((prev + 1))..$cur" count="$(notmuch count "$query" 2>/dev/null)" # Same validation, same reason: an empty string must not become a @@ -245,9 +246,10 @@ tick() { notify_account "$label" "$key" "$count" "$(build_body "$rows" "$count")" done < <(parse_accounts < "$CONFIG") - # Written only after every account is done, so a failure part way through - # leaves prev unchanged and the next tick retries rather than dropping a - # batch silently. + # Written only after every account is done. A single account whose count + # fails to validate is skipped above but does not hold the revision back; + # leaving it behind would re-notify every successful account's range on + # each later tick. Only a failed state write itself leaves prev unchanged. write_state "$uuid" "$cur" } diff --git a/mail-overview/test-mail-notify.sh b/mail-overview/test-mail-notify.sh index 9fc21a9..1c3e01a 100755 --- a/mail-overview/test-mail-notify.sh +++ b/mail-overview/test-mail-notify.sh @@ -115,6 +115,10 @@ check "malformed json yields an empty body rather than an error" \ "" \ "$(build_body 'not json at all' 1 2>/dev/null)" +check "a newline in a subject stays on one row" \ + "• Alice Example — line one line two" \ + "$(build_body '[{"authors":"Alice Example","subject":"line one\nline two"}]' 1)" + # A scratch state file, removed at exit. Never the real one: that is the # user's live notification position, and a test must not move it. tmpstate="$(mktemp)" |