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

improved POSIX

Browse Source
This commit is contained in:
Ämin Baumeler
2026-03-17 14:00:07 +01:00
parent ea16fb03d5
commit ce9f16e293
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.sh
View File

@@ -136,7 +136,7 @@ if [ "${1:-}" = "--archive" ]; then
[ "$1" = "thread" ] && thread=1
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
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
@@ -147,14 +147,14 @@ if [ "${1:-}" = "--delete" ]; then
[ "$1" = "thread" ] && thread=1
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
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")"
query="$(echo " $*" | sed "s/\s\(\S\)/ thread:\1/g")"
$NOTMUCH tag -$TAG_DEL "$query"
exit
fi
@@ -164,7 +164,7 @@ if [ "${1:-}" = "--flag" ]; then
[ "$1" = "thread" ] && thread=1
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
$NOTMUCH tag +"$TAG_FLAGGED" "$query"
exit
fi
@@ -174,7 +174,7 @@ if [ "${1:-}" = "--unflag" ]; then
[ "$1" = "thread" ] && thread=1
shift
[ "${thread:-}" ] && field="thread" || field="id"
query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
$NOTMUCH tag -"$TAG_FLAGGED" "$query"
exit
fi
@@ -182,11 +182,10 @@ 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")")"
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
printf '%s' "$files" | xargs -d "\n" rm
nm_new
fi
exit
@@ -199,7 +198,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")"
query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
if [ "$sign" = "+" ]; then
tagquery=""
label_text="Add tag"
@@ -220,7 +219,7 @@ if [ "${1:-}" = "--tag-modify" ]; then
--border=double \
--border-label=" $label_text " | head -1 || true)
[ "$res" ] || exit
$NOTMUCH tag $sign$res "$query"
$NOTMUCH tag "$sign$res" "$query"
exit
fi
@@ -432,6 +431,7 @@ while true; do
--bind="$KEYS_VIEW_LOGS:execute:$0 --view-logs" \
--bind="$KEYS_SYNC:execute($0 --sync)+reload:$0 --list-threads \"$nmquery\"" \
--bind="$KEYS_COMPOSE:execute:$0 --compose" \
--bind="$KEYS_GOTO_FIRST:first" \
--bind="focus:change-preview:$0 --preview-thread {4}" \
--preview="$0 --preview-thread {4}" \
--preview-window="$FZF_DEFAULT_PREVIEW_WINDOW" | head -1 || true)
@@ -503,9 +503,9 @@ while true; do
--border=double \
--border-label=' Query history ' | head -1 || true)
;;
$CMD_GOTO_INBOX) nmquery="tag:$TAG_INBOX" ;;
$CMD_GOTO_UNREAD) nmquery="tag:$TAG_UNREAD" ;;
$CMD_GOTO_FLAGGED) nmquery="tag:$TAG_FLAGGED" ;;
"$CMD_GOTO_INBOX") nmquery="tag:$TAG_INBOX" ;;
"$CMD_GOTO_UNREAD") nmquery="tag:$TAG_UNREAD" ;;
"$CMD_GOTO_FLAGGED") nmquery="tag:$TAG_FLAGGED" ;;
*)
;;
esac