Compare commits

..

No commits in common. "87a41be6de4e5274fa44aa9650543a1eac8a0451" and "9e59e7a92396aa504b1245eaaab695e7c09b07de" have entirely different histories.

View File

@ -405,9 +405,6 @@ if [ "${1:-}" = "--day" ]; then
--accept-nth='1,2,3,4' \
--preview="$0 --preview {}" \
--expect="ctrl-n,esc,backspace,q" \
--bind='start:hide-preview' \
--bind='ctrl-j:down+hide-preview+transform:echo {} | grep \|\| || echo show-preview' \
--bind='ctrl-k:up+hide-preview+transform:echo {} | grep \|\| || echo show-preview' \
--bind="ctrl-s:execute($SYNC_CMD ; printf 'Press <enter> to continue.'; read -r tmp)" \
--bind="ctrl-alt-d:become($0 --delete {})"
)
@ -570,34 +567,17 @@ fi
DISPLAY_DATE=${DISPLAY_DATE:-today}
DISPLAY_DATE=$(date -d "$DISPLAY_DATE" +"%D")
DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
if [ "${1:-}" = "--list" ]; then
if [ -n "$3" ]; then
DISPLAY_DATE="$2 $3"
else
DISPLAY_DATE="today"
fi
echo "$DISPLAY_DATE" >>/tmp/xyz
DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
__list
exit
fi
if [ "${1:-}" = "--list-prev-day" ]; then
DISPLAY_DATE="$2 -1 days"
DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
__list
exit
fi
if [ "${1:-}" = "--list-next-day" ]; then
DISPLAY_DATE="$2 +7 days"
DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
__list
exit
fi
DISPLAY_DATE_PREV=$(date -d "$DISPLAY_DATE -1 week" +"%D")
DISPLAY_DATE_NEXT=$(date -d "$DISPLAY_DATE +1 week" +"%D")
DISPLAY_DATE_PREV_MONTH=$(date -d "$DISPLAY_DATE -1 month" +"%D")
DISPLAY_DATE_NEXT_MONTH=$(date -d "$DISPLAY_DATE +1 month" +"%D")
selection=$(
__list |
$FZF \
@ -616,22 +596,16 @@ selection=$(
--preview-window=up,7,border-bottom \
--preview="$0 --preview-week {}" \
--expect="ctrl-n" \
--bind="ctrl-j:transform:[ \$FZF_POS -le 1 ] &&
echo unbind\(load\)+reload:$0 --list-next-day {2} ||
echo down" \
--bind="ctrl-k:transform:[ \$FZF_POS -ge 7 ] &&
echo unbind\(load\)+reload:$0 --list-prev-day {2} ||
echo up" \
--bind="change:reload($0 --all)+hide-preview" \
--bind="backward-eof:reload($0 --list)+show-preview" \
--bind="load:pos($DISPLAY_POS)" \
--bind="ctrl-u:reload:$0 --list {2} '-1 week'" \
--bind="ctrl-d:reload:$0 --list {2} '+1 week'" \
--bind="ctrl-alt-u:reload:$0 --list {2} '-1 month'" \
--bind="ctrl-alt-d:reload:$0 --list {2} '+1 month'" \
--bind="ctrl-u:become($0 --date '$DISPLAY_DATE_PREV')" \
--bind="ctrl-d:become($0 --date '$DISPLAY_DATE_NEXT')" \
--bind="ctrl-alt-u:become($0 --date '$DISPLAY_DATE_PREV_MONTH')" \
--bind="ctrl-alt-d:become($0 --date '$DISPLAY_DATE_NEXT_MONTH')" \
--bind="ctrl-s:execute($SYNC_CMD ; printf 'Press <enter> to continue.'; read -r tmp)" \
--bind="ctrl-g:become($0 --goto)" \
--bind="ctrl-l:rebind(load)+reload:$0 --list"
--bind="ctrl-l:become($0)"
)
key=$(echo "$selection" | head -1)