mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #983 from luukvbaal/preview-tui 

preview-tui: fix cleanup/resize
This commit is contained in:
Piña Colada 2021-05-01 21:55:37 +05:30 committed by GitHub
parent 74785069e0 65e306feec
commit 703be56930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/preview-tui
View File

@ -156,7 +156,7 @@ fifo_pager() {
exec > "$tmpfifopath" exec > "$tmpfifopath"
if [ "$cmd" = "pager" ]; then if [ "$cmd" = "pager" ]; then
if exists bat; then if exists bat; then
bat --terminal-width="$(tput cols)" --paging=never --decorations=always --color=always "$@" & bat --terminal-width="$(tput cols)" --paging=never --decorations=always --color=always "$@" 2>/dev/null &
else else
$PAGER "$@" & $PAGER "$@" &
fi fi
@ -275,9 +275,9 @@ ueberzug_refresh() {
pkill -P "$$" >/dev/null 2>&1 pkill -P "$$" >/dev/null 2>&1
pkill -f -n preview-tui-ext >/dev/null 2>&1 pkill -f -n preview-tui-ext >/dev/null 2>&1
tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json & tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json &
preview_file "$(cat "$CURSEL")"
printf "\n" > "$NNN_FIFO" printf "\n" > "$NNN_FIFO"
preview_fifo 2>/dev/null & preview_fifo 2>/dev/null &
preview_file "$(cat "$CURSEL")"
wait wait
} }
@ -292,20 +292,23 @@ preview_fifo() {
preview_file "$selection" preview_file "$selection"
printf "%s" "$selection" > "$CURSEL" printf "%s" "$selection" > "$CURSEL"
done done
[ "$TERMINAL" != "kitty" ] && exists ueberzug && rm "$FIFO_UEBERZUG" kill "$(cat "$GIFPID" 2>/dev/null)" >/dev/null 2>&1
rm "$PAGERPID" "$GIFPID" "$CURSEL" >/dev/null 2>&1 kill "$(cat "$PAGERPID" 2>/dev/null)" >/dev/null 2>&1
[ "$TERMINAL" != "kitty" ] && exists ueberzug && ueberzug_remove
rm "$PAGERPID" "$GIFPID" "$CURSEL" "$FIFO_UEBERZUG" >/dev/null 2>&1
pkill -P "$$" >/dev/null 2>&1 pkill -P "$$" >/dev/null 2>&1
} }
if [ "$PREVIEW_MODE" ]; then if [ "$PREVIEW_MODE" ]; then
if [ "$TERMINAL" != "kitty" ] && exists ueberzug; then if [ "$TERMINAL" != "kitty" ] && exists ueberzug; then
mkfifo "$FIFO_UEBERZUG" mkfifo "$FIFO_UEBERZUG"
trap 'ueberzug_refresh; rm $FIFO_UEBERZUG' WINCH trap 'ueberzug_refresh; rm "$FIFO_UEBERZUG"' WINCH
tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json & tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json &
fi fi
trap 'rm "$PAGERPID" "$GIFPID" "$CURSEL" 2>/dev/null' INT HUP EXIT trap 'rm "$PAGERPID" "$GIFPID" "$CURSEL" "$FIFO_UEBERZUG" 2>/dev/null' INT HUP EXIT
preview_file "$1" preview_file "$PWD/$1"
printf "%s" "$PWD/$1" > "$CURSEL" &
preview_fifo 2>/dev/null & preview_fifo 2>/dev/null &
wait wait
else else

17
plugins/preview-tui-ext
View File

@ -176,7 +176,7 @@ fifo_pager() {
exec > "$tmpfifopath" exec > "$tmpfifopath"
if [ "$cmd" = "pager" ]; then if [ "$cmd" = "pager" ]; then
if exists bat; then if exists bat; then
bat --terminal-width="$(tput cols)" --paging=never --decorations=always --color=always "$@" & bat --terminal-width="$(tput cols)" --paging=never --decorations=always --color=always "$@" 2>/dev/null &
else else
$PAGER "$@" & $PAGER "$@" &
fi fi
@ -384,9 +384,9 @@ ueberzug_refresh() {
pkill -P "$$" >/dev/null 2>&1 pkill -P "$$" >/dev/null 2>&1
pkill -f -n preview-tui-ext >/dev/null 2>&1 pkill -f -n preview-tui-ext >/dev/null 2>&1
tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json & tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json &
preview_file "$(cat "$CURSEL")"
printf "\n" > "$NNN_FIFO" printf "\n" > "$NNN_FIFO"
preview_fifo 2>/dev/null & preview_fifo 2>/dev/null &
preview_file "$(cat "$CURSEL")"
wait wait
} }
@ -401,20 +401,23 @@ preview_fifo() {
preview_file "$selection" preview_file "$selection"
printf "%s" "$selection" > "$CURSEL" printf "%s" "$selection" > "$CURSEL"
done done
[ "$TERMINAL" != "kitty" ] && exists ueberzug && rm "$FIFO_UEBERZUG" kill "$(cat "$GIFPID" 2>/dev/null)" >/dev/null 2>&1
rm "$PAGERPID" "$GIFPID" "$CURSEL" >/dev/null 2>&1 kill "$(cat "$PAGERPID" 2>/dev/null)" >/dev/null 2>&1
[ "$TERMINAL" != "kitty" ] && exists ueberzug && ueberzug_remove
rm "$PAGERPID" "$GIFPID" "$CURSEL" "$FIFO_UEBERZUG" >/dev/null 2>&1
pkill -P "$$" >/dev/null 2>&1 pkill -P "$$" >/dev/null 2>&1
} }
if [ "$PREVIEW_MODE" ]; then if [ "$PREVIEW_MODE" ]; then
if [ "$TERMINAL" != "kitty" ] && exists ueberzug; then if [ "$TERMINAL" != "kitty" ] && exists ueberzug; then
mkfifo "$FIFO_UEBERZUG" mkfifo "$FIFO_UEBERZUG"
trap 'ueberzug_refresh; rm $FIFO_UEBERZUG' WINCH trap 'ueberzug_refresh; rm "$FIFO_UEBERZUG"' WINCH
tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json & tail --follow "$FIFO_UEBERZUG" | ueberzug layer --silent --parser json &
fi fi
trap 'rm "$PAGERPID" "$GIFPID" "$CURSEL" 2>/dev/null' INT HUP EXIT trap 'rm "$PAGERPID" "$GIFPID" "$CURSEL" "$FIFO_UEBERZUG" 2>/dev/null' INT HUP EXIT
preview_file "$1" preview_file "$PWD/$1"
printf "%s" "$PWD/$1" > "$CURSEL" &
preview_fifo 2>/dev/null & preview_fifo 2>/dev/null &
wait wait
else else