mirror of
https://github.com/jarun/nnn.git
synced 2024-11-28 05:41:31 +00:00
Merge pull request #963 from luukvbaal/preview-tui
preview-tui: reformat QuickLook
This commit is contained in:
commit
b0a985bca8
|
@ -148,12 +148,8 @@ preview_file () {
|
||||||
cols=$(tput cols)
|
cols=$(tput cols)
|
||||||
|
|
||||||
# Otherwise, falling back to the defaults.
|
# Otherwise, falling back to the defaults.
|
||||||
if [ -n "$QUICKLOOK" ]; then
|
if [ -n "$QUICKLOOK" ] && stat "$1" >/dev/null 2>&1; then
|
||||||
if exists QuickLook.exe && stat "$1" >/dev/null 2>&1; then
|
f="$(wslpath -w "$1" 2>&1)" && "$QLPATH" "$f" &
|
||||||
f="$(wslpath -w "$1" 2>&1)" && QuickLook.exe "$f" &
|
|
||||||
elif exists Bridge.exe && stat "$1" >/dev/null 2>&1; then
|
|
||||||
f="$(wslpath -w "$1" 2>&1)" && Bridge.exe "$f" &
|
|
||||||
fi
|
|
||||||
elif [ -d "$1" ]; then
|
elif [ -d "$1" ]; then
|
||||||
cd "$1" || return
|
cd "$1" || return
|
||||||
if exists tree; then
|
if exists tree; then
|
||||||
|
@ -190,10 +186,8 @@ image_preview() {
|
||||||
# Kitty terminal users can use the native image preview method.
|
# Kitty terminal users can use the native image preview method.
|
||||||
kitty +kitten icat --silent --place "$1"x"$2"@0x0 --transfer-mode=stream --stdin=no \
|
kitty +kitten icat --silent --place "$1"x"$2"@0x0 --transfer-mode=stream --stdin=no \
|
||||||
"$3"
|
"$3"
|
||||||
elif exists QuickLook.exe && stat "$3" >/dev/null 2>&1; then
|
elif [ -n "$QLPATH" ] && stat "$3" >/dev/null 2>&1; then
|
||||||
f="$(wslpath -w "$3" 2>&1)" && QuickLook.exe "$f"
|
f="$(wslpath -w "$3" 2>&1)" && "$QLPATH" "$f" &
|
||||||
elif exists Bridge.exe && stat "$3" >/dev/null 2>&1; then
|
|
||||||
f="$(wslpath -w "$3" 2>&1)" && Bridge.exe "$f"
|
|
||||||
elif exists ueberzug; then
|
elif exists ueberzug; then
|
||||||
ueberzug_layer "$1" "$2" "$3"
|
ueberzug_layer "$1" "$2" "$3"
|
||||||
elif exists catimg; then
|
elif exists catimg; then
|
||||||
|
@ -273,13 +267,15 @@ if [ "$PREVIEW_MODE" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if pgrep -f "cat $NNN_FIFO" >/dev/null; then
|
if exists QuickLook.exe; then
|
||||||
if exists QuickLook.exe && stat "$1" >/dev/null 2>&1; then
|
QLPATH="QuickLook.exe"
|
||||||
f="$(wslpath -w "$1" 2>&1)" && QuickLook.exe "$f" &
|
elif exists Bridge.exe; then
|
||||||
elif exists Bridge.exe && stat "$1" >/dev/null 2>&1; then
|
QLPATH="Bridge.exe"
|
||||||
f="$(wslpath -w "$1" 2>&1)" && Bridge.exe "$f" &
|
fi
|
||||||
|
if pkill -fx "cat $NNN_FIFO" >/dev/null; then
|
||||||
|
if [ -n "$QLPATH" ] && stat "$1" >/dev/null 2>&1; then
|
||||||
|
f="$(wslpath -w "$1" 2>&1)" && "$QLPATH" "$f" &
|
||||||
fi
|
fi
|
||||||
pkill -f "cat $NNN_FIO"
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [ "$TERMINAL" = "tmux" ]; then
|
if [ "$TERMINAL" = "tmux" ]; then
|
||||||
|
@ -288,7 +284,7 @@ if [ "$TERMINAL" = "tmux" ]; then
|
||||||
|
|
||||||
tmux split-window -e "NNN_FIFO=$NNN_FIFO" -e "PREVIEW_MODE=1" -e "PAGER=$PAGER" \
|
tmux split-window -e "NNN_FIFO=$NNN_FIFO" -e "PREVIEW_MODE=1" -e "PAGER=$PAGER" \
|
||||||
-e "USE_SCOPE=$USE_SCOPE" -e "SPLIT=$SPLIT" -e "USE_PISTOL=$USE_PISTOL" \
|
-e "USE_SCOPE=$USE_SCOPE" -e "SPLIT=$SPLIT" -e "USE_PISTOL=$USE_PISTOL" \
|
||||||
-d"$SPLIT" "$0" "$1"
|
-e "QLPATH=$QLPATH" -d"$SPLIT" "$0" "$1"
|
||||||
elif [ "$TERMINAL" = "kitty" ]; then
|
elif [ "$TERMINAL" = "kitty" ]; then
|
||||||
# Setting the layout for the new window. It will be restored after the
|
# Setting the layout for the new window. It will be restored after the
|
||||||
# script ends.
|
# script ends.
|
||||||
|
@ -303,8 +299,8 @@ elif [ "$TERMINAL" = "kitty" ]; then
|
||||||
--env "USE_SCOPE=$USE_SCOPE" --env "SPLIT=$SPLIT" \
|
--env "USE_SCOPE=$USE_SCOPE" --env "SPLIT=$SPLIT" \
|
||||||
--env "USE_PISTOL=$USE_PISTOL" \
|
--env "USE_PISTOL=$USE_PISTOL" \
|
||||||
--location "${SPLIT}split" "$0" "$1" >/dev/null
|
--location "${SPLIT}split" "$0" "$1" >/dev/null
|
||||||
elif exists QuickLook.exe || exists Bridge.exe; then
|
elif [ -n "$QLPATH" ]; then
|
||||||
QUICKLOOK=1 PREVIEW_MODE=1 "$0" "$1" >/dev/null &
|
QUICKLOOK=1 QLPATH="$QLPATH" PREVIEW_MODE=1 "$0" "$1" >/dev/null &
|
||||||
else
|
else
|
||||||
PREVIEW_MODE=1 $TERMINAL -e "$0" "$1" &
|
PREVIEW_MODE=1 $TERMINAL -e "$0" "$1" &
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -165,12 +165,8 @@ preview_file() {
|
||||||
cols=$(tput cols)
|
cols=$(tput cols)
|
||||||
|
|
||||||
# Otherwise, falling back to the defaults.
|
# Otherwise, falling back to the defaults.
|
||||||
if [ -n "$QUICKLOOK" ]; then
|
if [ -n "$QUICKLOOK" ] && stat "$1" >/dev/null 2>&1; then
|
||||||
if exists QuickLook.exe && stat "$1" >/dev/null 2>&1; then
|
f="$(wslpath -w "$1" 2>&1)" && "$QLPATH" "$f" &
|
||||||
f="$(wslpath -w "$1" 2>&1)" && QuickLook.exe "$f" &
|
|
||||||
elif exists Bridge.exe && stat "$1" >/dev/null 2>&1; then
|
|
||||||
f="$(wslpath -w "$1" 2>&1)" && Bridge.exe "$f" &
|
|
||||||
fi
|
|
||||||
elif [ -d "$1" ]; then
|
elif [ -d "$1" ]; then
|
||||||
cd "$1" || return
|
cd "$1" || return
|
||||||
if [ "$ICONLOOKUP" -ne 0 ] && [ -f "$(dirname "$0")"/.iconlookup ]; then
|
if [ "$ICONLOOKUP" -ne 0 ] && [ -f "$(dirname "$0")"/.iconlookup ]; then
|
||||||
|
@ -248,10 +244,8 @@ preview_file() {
|
||||||
}
|
}
|
||||||
|
|
||||||
generate_preview() {
|
generate_preview() {
|
||||||
if exists QuickLook.exe && stat "$3" >/dev/null 2>&1; then
|
if [ -n "$QLPATH" ] && stat "$3" >/dev/null 2>&1; then
|
||||||
f="$(wslpath -w "$3" 2>&1)" && QuickLook.exe "$f" &
|
f="$(wslpath -w "$3" 2>&1)" && "$QLPATH" "$f" &
|
||||||
elif exists Bridge.exe && stat "$3" >/dev/null 2>&1; then
|
|
||||||
f="$(wslpath -w "$3" 2>&1)" && Bridge.exe "$f" &
|
|
||||||
elif [ ! -f "$NNN_PREVIEWDIR/$3.jpg" ] || [ -n "$(find -L "$3" -newer "$NNN_PREVIEWDIR/$3.jpg")" ]; then
|
elif [ ! -f "$NNN_PREVIEWDIR/$3.jpg" ] || [ -n "$(find -L "$3" -newer "$NNN_PREVIEWDIR/$3.jpg")" ]; then
|
||||||
mkdir -p "$NNN_PREVIEWDIR/${3%/*}"
|
mkdir -p "$NNN_PREVIEWDIR/${3%/*}"
|
||||||
case $4 in
|
case $4 in
|
||||||
|
@ -374,13 +368,15 @@ if [ "$PREVIEW_MODE" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if pgrep -f "cat $NNN_FIFO" >/dev/null; then
|
if exists QuickLook.exe; then
|
||||||
if exists QuickLook.exe && stat "$1" >/dev/null 2>&1; then
|
QLPATH="QuickLook.exe"
|
||||||
f="$(wslpath -w "$1" 2>&1)" && QuickLook.exe "$f" &
|
elif exists Bridge.exe; then
|
||||||
elif exists Bridge.exe && stat "$1" >/dev/null 2>&1; then
|
QLPATH="Bridge.exe"
|
||||||
f="$(wslpath -w "$1" 2>&1)" && Bridge.exe "$f" &
|
fi
|
||||||
|
if pkill -fx "cat $NNN_FIFO" >/dev/null; then
|
||||||
|
if [ -n "$QLPATH" ] && stat "$1" >/dev/null 2>&1; then
|
||||||
|
f="$(wslpath -w "$1" 2>&1)" && "$QLPATH" "$f" &
|
||||||
fi
|
fi
|
||||||
pkill -f "cat $NNN_FIO"
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [ "$TERMINAL" = "tmux" ]; then
|
if [ "$TERMINAL" = "tmux" ]; then
|
||||||
|
@ -389,7 +385,7 @@ if [ "$TERMINAL" = "tmux" ]; then
|
||||||
|
|
||||||
tmux split-window -e "NNN_FIFO=$NNN_FIFO" -e "PREVIEW_MODE=1" -e "PAGER=$PAGER" \
|
tmux split-window -e "NNN_FIFO=$NNN_FIFO" -e "PREVIEW_MODE=1" -e "PAGER=$PAGER" \
|
||||||
-e "USE_SCOPE=$USE_SCOPE" -e "SPLIT=$SPLIT" -e "USE_PISTOL=$USE_PISTOL" \
|
-e "USE_SCOPE=$USE_SCOPE" -e "SPLIT=$SPLIT" -e "USE_PISTOL=$USE_PISTOL" \
|
||||||
-e "ICONLOOKUP=$ICONLOOKUP" -d"$SPLIT" "$0" "$1"
|
-e "ICONLOOKUP=$ICONLOOKUP" -e "QLPATH=$QLPATH" -d"$SPLIT" "$0" "$1"
|
||||||
elif [ "$TERMINAL" = "kitty" ]; then
|
elif [ "$TERMINAL" = "kitty" ]; then
|
||||||
# Setting the layout for the new window. It will be restored after the
|
# Setting the layout for the new window. It will be restored after the
|
||||||
# script ends.
|
# script ends.
|
||||||
|
@ -404,8 +400,8 @@ elif [ "$TERMINAL" = "kitty" ]; then
|
||||||
--env "USE_SCOPE=$USE_SCOPE" --env "SPLIT=$SPLIT" \
|
--env "USE_SCOPE=$USE_SCOPE" --env "SPLIT=$SPLIT" \
|
||||||
--env "USE_PISTOL=$USE_PISTOL" --env "ICONLOOKUP=$ICONLOOKUP" \
|
--env "USE_PISTOL=$USE_PISTOL" --env "ICONLOOKUP=$ICONLOOKUP" \
|
||||||
--location "${SPLIT}split" "$0" "$1" >/dev/null
|
--location "${SPLIT}split" "$0" "$1" >/dev/null
|
||||||
elif exists QuickLook.exe || exists Bridge.exe; then
|
elif [ -n "$QLPATH" ]; then
|
||||||
QUICKLOOK=1 PREVIEW_MODE=1 "$0" "$1" >/dev/null &
|
QUICKLOOK=1 QLPATH="$QLPATH" PREVIEW_MODE=1 "$0" "$1" >/dev/null &
|
||||||
else
|
else
|
||||||
PREVIEW_MODE=1 $TERMINAL -e "$0" "$1" &
|
PREVIEW_MODE=1 $TERMINAL -e "$0" "$1" &
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue