amin/not-much-fuzz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tags keys and other improvements

Browse Source
This commit is contained in:
Ämin Baumeler
2026-03-16 09:39:08 +01:00
parent 8a0c8bc2d7
commit 28aca1a82b
7 changed files with 232 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
src/main.sh
View File

@@ -29,6 +29,15 @@ set -eu
# preview functions
. "sh/preview.sh"
# varia functions
. "sh/varia.sh"
# tags
. "sh/tags.sh"
# keys
. "sh/keys.sh"
if [ "${1:-}" = "--list-threads" ]; then
shift
nmquery="$1"
@@ -74,7 +83,7 @@ fi
if [ "${1:-}" = "--view-source" ]; then
shift
messageid="$1"
less $($NOTMUCH search --output=files id:$messageid)
$NOTMUCH show --part=0 id:"$messageid" | $CATEMAIL | less
exit
fi
@@ -85,7 +94,7 @@ if [ "${1:-}" = "--show-message-parts" ]; then
exit
fi
# FZF default configs
# FZF defaults
FZF_DEFAULT_PREVIEW_WINDOW="right,80,border-line,wrap-word"
FZF_ALTERNATE_PREVIEW_WINDOW="bottom,80%,border-line,wrap-word"
FZF_DEFAULT_THREAD_LINE="{1} {3} ({4})"
@@ -101,32 +110,18 @@ if [ "${1:-}" = "--open-part" ]; then
--with-nth=2 \
--accept-nth=1 \
--margin='30%' \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--bind='page-up:preview-half-page-up,page-down:preview-half-page-down' \
--bind="ctrl-h,backward-eof:abort" || true)
--bind='change:best' \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_ENTER:accept" \
--bind="$KEYS_BACK,$KEYS_CANCEL,backward-eof:abort" || true)
[ "$res" ] || exit
tmpfile=$(mktemp)
nm_message_get_part "$messageid" "$res" > "$tmpfile"
file "$tmpfile"
while true; do
printf "Are you sure you want to open \"%s\"? (yes/no): " "$tmpfile" >/dev/tty
read -r yn
case $yn in
"yes")
open "$tmpfile" >/dev/null 2>/dev/stdout
printf "Press <enter> to continue." >/dev/tty
read -r tmp
break
;;
"no")
break
;;
*)
echo "Please answer \"yes\" or \"no\"." >/dev/tty
;;
esac
done
rm -f "$tmpfile"
if ynprompt "Are you sure you want to open this file?" "$(ls -lh "$tmpfile")\n$(file -b "$tmpfile")"; then
# TODO: should we clean up at some point?
open "$tmpfile" >/dev/null 2>/dev/stdout
fi
exit
fi
@@ -135,9 +130,9 @@ if [ "${1:-}" = "--archive" ]; then
[ "$1" = "thread" ] && thread=1
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo "$@" | sed "s/\s\(\S\)/ $field:\1/g" | sed "s/^/$field:/")"
nm_tag "-inbox" "$query"
nm_tag "-unread" "$query"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
tagmod="$(echo " $TAG_INBOX $TAGS_NEW" | sed "s/\s\(\S\)/ -\1/g")"
$NOTMUCH tag $tagmod "$query"
exit
fi
@@ -146,9 +141,27 @@ if [ "${1:-}" = "--delete" ]; then
[ "$1" = "thread" ] && thread=1
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo "$@" | sed "s/\s\(\S\)/ $field:\1/g" | sed "s/^/$field:/")"
nm_tag "-inbox" "$query"
nm_tag "+del" "$query"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
$NOTMUCH tag -$TAG_INBOX +$TAG_DEL "$query"
exit
fi
if [ "${1:-}" = "--undelete" ]; then
shift
query="$(echo " $@" | sed "s/\s\(\S\)/ thread:\1/g")"
$NOTMUCH tag -$TAG_DEL "$query"
exit
fi
if [ "${1:-}" = "--purge" ]; then
shift
# query="$(echo " $@" | sed "s/\s\(\S*\)/ (thread:\1 and tag:del)/g" | sed 's/)\(\s\+\)(/) or (/g')"
query="tag:$TAG_DEL and ("$(echo " $@" | sed "s/\s\(\S\)/ thread:\1/g")")"
files=$(nm_files_all "$query")
if ynprompt "Are you sure you want to purge these files?" "$files"; then
echo -n "$files" | xargs -d "\n" rm
nm_new
fi
exit
fi
@@ -159,7 +172,7 @@ if [ "${1:-}" = "--tag-modify" ]; then
[ "$1" = "add" ] && sign=+ || sign=-
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo "$@" | sed "s/\s\(\S\)/ $field:\1/g" | sed "s/^/$field:/")"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
if [ "$sign" = "+" ]; then
tagquery=""
label_text="Add tag"
@@ -171,13 +184,16 @@ if [ "${1:-}" = "--tag-modify" ]; then
--color="border:$ANSICOLORTAGS" \
--color="label:$ANSICOLORTAGS" \
--tac \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_BACK,$KEYS_CANCEL,backward-eof:abort" \
--bind="$KEYS_ENTER:accept-or-print-query" \
--bind="$KEYS_ENTER_ALTERNATIVE:transform:echo \"print(\$FZF_QUERY)+accept\"" \
--margin='20%' \
--bind='enter:accept-or-print-query' \
--border=double \
--border-label=" $label_text " || true)
--border-label=" $label_text " | head -1 || true)
[ "$res" ] || exit
nm_tag "$sign$res" "$query"
$NOTMUCH tag $sign$res "$query"
exit
fi
@@ -191,28 +207,58 @@ if [ "${1:-}" = "--show-thread" ]; then
--multi \
--delimiter="$(printf '\t')" \
--with-nth="$FZF_DEFAULT_THREAD_LINE" \
--bind="ctrl-r:reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="alt-s:change-with-nth({1} {2} {3} ({4})|$FZF_DEFAULT_THREAD_LINE)" \
--accept-nth=5 \
--bind='alt-j:preview-down,alt-k:preview-up' \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--bind='page-up:preview-half-page-up,page-down:preview-half-page-down' \
--bind="enter:" \
--bind="ctrl-h,backward-eof:abort" \
--bind="alt-/:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
--bind="alt-v:execute:$0 --view-source {5}" \
--bind="alt-h:change-preview:$0 --preview-html-message {5}" \
--bind="alt-+:execute($0 --tag-modify message add {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="alt--:execute($0 --tag-modify message del {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="alt-enter:execute($0 --archive message {+4})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="alt-delete:execute($0 --delete message {+4})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="$KEYS_CANCEL:transform:[ \$FZF_SELECT_COUNT -gt 0 ] && echo clear-multi || echo abort" \
--bind="$KEYS_PREVIEW_DOWN:preview-down" \
--bind="$KEYS_PREVIEW_UP:preview-up" \
--bind="$KEYS_PREVIEW_DOWN_HP:preview-half-page-down" \
--bind="$KEYS_PREVIEW_UP_HP:preview-half-page-up" \
--bind="$KEYS_CYCLE_DISPLAY:change-with-nth({1} {2} {3} ({4})|$FZF_DEFAULT_THREAD_LINE)" \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_ENTER:" \
--bind="$KEYS_BACK,$KEYS_CANCEL,backward-eof:abort" \
--bind="$KEYS_PREVIEW_TOGGLE_SIZE:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
--bind="$KEYS_VIEW_SOURCE:execute:$0 --view-source {5}" \
--bind="$KEYS_HTML_PREVIEW:change-preview:$0 --preview-html-message {5}" \
--bind="$KEYS_TAG_ADD:execute($0 --tag-modify message add {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="$KEYS_TAG_REMOVE:execute($0 --tag-modify message del {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="$KEYS_ARCHIVE:execute($0 --archive message {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="$KEYS_DELETE:execute($0 --delete message {+5})+reload:$0 --list-messages-in-thread \"$thread\"" \
--bind="$KEYS_OPEN:execute:$0 --open-part {5}" \
--bind="$KEYS_FLAG_TOGGLE:execute:echo NOT IMPLEMENTED;read -r t" \
--bind="$KEYS_REPLY:execute:echo NOT IMPLEMENTED;read -r t" \
--bind="$KEYS_COMPOSE:execute:echo NOT IMPLEMENTED;read -r t" \
--bind="focus:change-preview($0 --preview-message {5})+transform-footer:printf '\033[4mMesssage parts\033[0m\n';$0 --show-message-parts {5}" \
--bind="ctrl-o:execute:$0 --open-part {5}" \
--preview="$0 --preview-message {5}" \
--preview-window="$FZF_DEFAULT_PREVIEW_WINDOW" || true)
exit
fi
if [ "${1:-}" = "--list-deleted" ]; then
shift
list_threads "tag:$TAG_DEL" | $FZF \
--header-first \
--margin='5%' \
--header='DELETED MESSAGES' \
--footer="$KEYS_PURGE_ALL: purge ALL threads / $KEYS_DELETE: purge selected threads / $KEYS_ENTER_ALTERNATIVE: undelete selected threads" \
--border='double' \
--color="header:red:bold:underline,border:red,selected-bg:88" \
--tiebreak=index \
--reverse \
--multi \
--delimiter="$(printf '\t')" \
--with-nth='{1} {2} ({3})' \
--bind="$KEYS_CANCEL:transform:[ \$FZF_SELECT_COUNT -gt 0 ] && echo clear-multi || echo abort" \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_ENTER:" \
--bind="$KEYS_PURGE_ALL:select-all+execute($0 --purge {+4})+reload:$0 --list-threads \"tag:$TAG_DEL\"" \
--bind="$KEYS_DELETE:execute($0 --purge {+4})+reload:$0 --list-threads \"tag:$TAG_DEL\"" \
--bind="$KEYS_ENTER_ALTERNATIVE:execute($0 --undelete {+4})+reload:$0 --list-threads \"tag:$TAG_DEL\""
exit
fi
# Modes
APPEND="append"
NWSRCH="search"
@@ -221,9 +267,10 @@ ADDRESS_TO="to-"
ADDRESS_FROM="from-"
CMD_SEARCH_ADDRESS="address-"
CMD_EDIT_QUERY="edit-query"
CMD_GOTO_INBOX="go-to-inbox"
while true; do
nmquery="${nmquery:-tag:inbox}"
nmquery="${nmquery:-tag:$TAG_INBOX}"
[ "$(tail -1 "$NMFHIST")" = "$nmquery" ] || echo "$nmquery" >> "$NMFHIST"
cmd=$(list_threads "$nmquery" | $FZF \
--header-first \
@@ -233,24 +280,29 @@ while true; do
--multi \
--delimiter="$(printf '\t')" \
--with-nth="{1} {2} ({3})" \
--bind="ctrl-r:reload:$0 --list-threads \"$nmquery\"" \
--bind="alt-t:print($CMD_SEARCH_TAG$NWSRCH)+accept" \
--bind="alt-T:print($CMD_SEARCH_TAG$APPEND)+accept" \
--bind="alt-s:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$NWSRCH)+accept" \
--bind="alt-S:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$APPEND)+accept" \
--bind="alt-r:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$NWSRCH)+accept" \
--bind="alt-R:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$APPEND)+accept" \
--bind="alt-q:print($CMD_EDIT_QUERY)+accept" \
--bind='alt-j:preview-down,alt-k:preview-up' \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--bind='page-up:preview-half-page-up,page-down:preview-half-page-down' \
--bind="enter,ctrl-l:execute($0 --show-thread {4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="alt-/:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
--bind="alt-h:change-preview:$0 --preview-html-thread {4}" \
--bind="alt-+:execute($0 --tag-modify thread add {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="alt--:execute($0 --tag-modify thread del {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="alt-enter:execute($0 --archive thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="alt-delete:execute($0 --delete thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_SEARCH_TAG_REPLCE:print($CMD_SEARCH_TAG$NWSRCH)+accept" \
--bind="$KEYS_SEARCH_TAG_APPEND:print($CMD_SEARCH_TAG$APPEND)+accept" \
--bind="$KEYS_SEARCH_FROM_REPLCE:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$NWSRCH)+accept" \
--bind="$KEYS_SEARCH_FROM_APPEND:print($CMD_SEARCH_ADDRESS$ADDRESS_FROM$APPEND)+accept" \
--bind="$KEYS_SEARCH_TO_REPLCE:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$NWSRCH)+accept" \
--bind="$KEYS_SEARCH_TO_APPEND:print($CMD_SEARCH_ADDRESS$ADDRESS_TO$APPEND)+accept" \
--bind="$KEYS_SEARCH_EDIT_QUERY:print($CMD_EDIT_QUERY)+accept" \
--bind="$KEYS_PREVIEW_DOWN:preview-down" \
--bind="$KEYS_PREVIEW_UP:preview-up" \
--bind="$KEYS_PREVIEW_DOWN_HP:preview-half-page-down" \
--bind="$KEYS_PREVIEW_UP_HP:preview-half-page-up" \
--bind="$KEYS_CANCEL:clear-multi" \
--bind="$KEYS_ENTER:execute($0 --show-thread {4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_PREVIEW_TOGGLE_SIZE:change-preview-window($FZF_ALTERNATE_PREVIEW_WINDOW|$FZF_DEFAULT_PREVIEW_WINDOW)" \
--bind="$KEYS_HTML_PREVIEW:change-preview:$0 --preview-html-thread {4}" \
--bind="$KEYS_TAG_ADD:execute($0 --tag-modify thread add {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_TAG_REMOVE:execute($0 --tag-modify thread del {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_ARCHIVE:execute($0 --archive thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_DELETE:execute($0 --delete thread {+4})+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_SEARCH_DELETED:execute:$0 --list-deleted" \
--bind="$KEYS_SEARCH_INBOX:print($CMD_GOTO_INBOX)+accept" \
--bind="focus:change-preview:$0 --preview-thread {4}" \
--preview="$0 --preview-thread {4}" \
--preview-window="$FZF_DEFAULT_PREVIEW_WINDOW" | head -1 || true)
@@ -261,11 +313,13 @@ while true; do
--color="border:$ANSICOLORTAGS" \
--color="label:$ANSICOLORTAGS" \
--tac \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--margin='20%' \
--bind='enter:accept-or-print-query' \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_ENTER:accept-or-print-query" \
--bind="$KEYS_ENTER_ALTERNATIVE:transform:echo \"print(\$FZF_QUERY)+accept\"" \
--border=double \
--border-label=" Select tag " || true)
--border-label=" Select tag " | head -1 || true)
[ -n "$tag" ] || continue
[ "$cmd" = "$CMD_SEARCH_TAG$APPEND" ] && nmquery="$nmquery and tag:$tag" || nmquery="tag:$tag"
;;
@@ -284,11 +338,13 @@ while true; do
--color="border:$ANSICOLORFROM" \
--color="label:$ANSICOLORFROM" \
--tiebreak=index \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--margin='20%' \
--bind='enter:accept-or-print-query' \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_ENTER:accept-or-print-query" \
--bind="$KEYS_ENTER_ALTERNATIVE:transform:echo \"print(\$FZF_QUERY)+accept\"" \
--border=double \
--border-label="$label_text" || true)
--border-label="$label_text" | head -1 || true)
[ -n "$address" ] || continue
case "$cmd" in
*$APPEND)
@@ -304,16 +360,21 @@ while true; do
--color="border:$ANSICOLORSUBJ" \
--color="label:$ANSICOLORSUBJ" \
--tac \
--bind='ctrl-d:half-page-down,ctrl-u:half-page-up' \
--margin='20%' \
--query="$nmquery" \
--disabled \
--print-query \
--prompt="Query: " \
--bind='focus:replace-query' \
--bind="$KEYS_DOWN_HP:half-page-down" \
--bind="$KEYS_UP_HP:half-page-up" \
--bind="$KEYS_ENTER:accept" \
--border=double \
--border-label=' Query history ' | head -1 || true)
;;
$CMD_GOTO_INBOX)
nmquery="tag:$TAG_INBOX"
;;
*)
;;
esac