1
1
mirror of https://github.com/jarun/nnn.git synced 2024-11-12 21:41:22 +03:00

preview-tui: make scope & pistol run before file (#647)

Both Pistol and `scope.sh` are run `file --mimetype` or an equivalent, internally.
Thus, for speed, it's better to run them before almost anything else.
This commit is contained in:
Doron Behar 2020-06-10 10:50:38 +03:00 committed by GitHub
parent 7b68844a05
commit 92ff1447c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -114,17 +114,6 @@ preview_file () {
kill %- %+ 2>/dev/null && wait %- %+ 2>/dev/null
clear
# Detecting the exact type of the file: the encoding, mime type, and
# extension in lowercase.
encoding="$(file -Lb --mime-encoding -- "$1")"
mimetype="$(file -Lb --mime-type -- "$1")"
ext="${1##*.}"
if [ -n "$ext" ]; then
ext="$(printf "%s" "${ext}" | tr '[:upper:]' '[:lower:]')"
fi
lines=$(($(tput lines)-1))
cols=$(tput cols)
# Trying to use pistol if it's available.
if [ "$USE_PISTOL" -ne 0 ] && exists pistol; then
fifo_pager pistol "$1"
@ -138,6 +127,17 @@ preview_file () {
return
fi
# Detecting the exact type of the file: the encoding, mime type, and
# extension in lowercase.
encoding="$(file -Lb --mime-encoding -- "$1")"
mimetype="$(file -Lb --mime-type -- "$1")"
ext="${1##*.}"
if [ -n "$ext" ]; then
ext="$(printf "%s" "${ext}" | tr '[:upper:]' '[:lower:]')"
fi
lines=$(($(tput lines)-1))
cols=$(tput cols)
# Otherwise, falling back to the defaults.
if [ -d "$1" ]; then
cd "$1" || return