From 92ff1447c010b450b3dc4004e9976b972841003d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 10 Jun 2020 10:50:38 +0300 Subject: [PATCH] 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. --- plugins/preview-tui | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/preview-tui b/plugins/preview-tui index 7b4a7a0a..45beac51 100755 --- a/plugins/preview-tui +++ b/plugins/preview-tui @@ -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