From e0822fdef4c0a2f62cb30014eb2befec12e90c78 Mon Sep 17 00:00:00 2001 From: luukvbaal <31730729+luukvbaal@users.noreply.github.com> Date: Sun, 21 Mar 2021 17:54:29 -0700 Subject: [PATCH] fill preview-tui preview (#907) * fill preview pane * add xcf preview and fix formatting * test which convert * restore -bL --- plugins/preview-tui | 2 +- plugins/preview-tui-ext | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/plugins/preview-tui b/plugins/preview-tui index 51eb0df2..6069356d 100755 --- a/plugins/preview-tui +++ b/plugins/preview-tui @@ -143,7 +143,7 @@ preview_file () { if [ -n "$ext" ]; then ext="$(printf "%s" "${ext}" | tr '[:upper:]' '[:lower:]')" fi - lines=$(($(tput lines)-1)) + lines=$(tput lines) cols=$(tput cols) # Otherwise, falling back to the defaults. diff --git a/plugins/preview-tui-ext b/plugins/preview-tui-ext index f49599d7..09a6bd8c 100755 --- a/plugins/preview-tui-ext +++ b/plugins/preview-tui-ext @@ -154,7 +154,7 @@ preview_file () { if [ -n "$ext" ]; then ext="$(printf "%s" "${ext}" | tr '[:upper:]' '[:lower:]')" fi - lines=$(($(tput lines)-1)) + lines=$(tput lines) cols=$(tput cols) # Otherwise, falling back to the defaults. @@ -170,6 +170,8 @@ preview_file () { elif [ "$encoding" = "binary" ]; then if [ "$ext" = "gif" ]; then generate_preview "$cols" "$lines" "$1" "gif" + elif [ "${mimetype#*/}" = "x-xcf" ]; then + generate_preview "$cols" "$lines" "$1" "xcf" elif [ "${mimetype%%/*}" = "image" ]; then image_preview "$cols" "$lines" "$1" elif [ "${mimetype%%/*}" = "audio" ] && exists ffmpeg; then @@ -230,7 +232,7 @@ generate_preview() { audio) ffmpeg -i "$3" "$TMPDIR/$3.jpg" -y >/dev/null 2>&1 ;; epub) gnome-epub-thumbnailer "$3" "$TMPDIR/$3.jpg" >/dev/null 2>&1 ;; font) fontpreview -i "$3" -o "$TMPDIR/$3.jpg" >/dev/null 2>&1 ;; - gif) if exists ueberzug || [ "$TERMINAL" = "kitty" ]; then + gif) if exists ueberzug && exists convert || [ "$TERMINAL" = "kitty" ]; then if [ ! -d "$TMPDIR/$3" ]; then mkdir -p "$TMPDIR/$3" convert -coalesce "$3" "$TMPDIR/$3/${3##*/}.jpg" @@ -253,10 +255,11 @@ generate_preview() { mv "$TMPDIR/${3%/*}/$filename.jpg" "$TMPDIR/$3.jpg" ;; pdf) pdftoppm -jpeg -f 1 -singlefile "$3" "$TMPDIR/$3" >/dev/null 2>&1 ;; video) if ! ffmpegthumbnailer -i "$3" -o "$TMPDIR/$3.jpg" -s 0 -q 10 >/dev/null 2>&1; then - rm "$TMPDIR/$3.jpg" - fifo_pager print_bin_info "$3" - return - fi + rm "$TMPDIR/$3.jpg" + fifo_pager print_bin_info "$3" + return + fi ;; + xcf) convert -flatten "$3" "$TMPDIR/$3.jpg" ;; esac fi if [ -f "$TMPDIR/$3.jpg" ]; then