From: johnnybash <georgpfahler@wachenzell.org>
Date: Sat, 26 Dec 2020 13:16:12 +0000 (+0100)
Subject: reuse image code, use more variables
X-Git-Tag: v3.6~32^2~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=4d77066b621e6c0a8fb17e384eba822f5d08248d;p=nnn.git

reuse image code, use more variables
---

diff --git a/plugins/preview-tui b/plugins/preview-tui
index 7ef9566b..6358b4fa 100755
--- a/plugins/preview-tui
+++ b/plugins/preview-tui
@@ -156,7 +156,12 @@ preview_file () {
             fifo_pager ls --color=always
         fi
     elif [ "$encoding" = "binary" ]; then
-        if [ "${mimetype%%/*}" = "image" ] ; then
+        if [ "${mimetype%%/*}" = "image" ] || [ "${mimetype%%/*}" = "video" ]; then
+            if [ "${mimetype%%/*}" = "video" ] && [ "$USE_VIDEOTHUMB" -ne 0 ] && exists ffmpegthumbnailer; then
+		videothumb="/tmp/videothumb.$$.png"
+		ffmpegthumbnailer -s 0 -i "$1" -o "$videothumb"
+		set "$videothumb"
+	    fi
             if [ "$TERMINAL" = "kitty" ]; then
                 # Kitty terminal users can use the native image preview method.
                 kitty +kitten icat --silent --transfer-mode=stream --stdin=no \
@@ -168,19 +173,6 @@ preview_file () {
             else
                 fifo_pager print_bin_info "$1"
             fi
-        elif [ "${mimetype%%/*}" = "video" ] && [ "$USE_VIDEOTHUMB" -ne 0 ] && exists ffmpegthumbnailer; then
-            ffmpegthumbnailer -s 0 -i "$1" -o "/tmp/videothumb.png"
-            if [ "$TERMINAL" = "kitty" ]; then
-                     # Kitty terminal users can use the native image preview method.
-                     kitty +kitten icat --silent --transfer-mode=stream --stdin=no \
-                          "/tmp/videothumb.png" &
-                elif exists catimg; then
-                     catimg "/tmp/videothumb.png"
-                elif exists viu; then
-                     viu -t "/tmp/videothumb.png"
-                else
-                     fifo_pager print_bin_info "$1"
-            fi
         elif [ "$mimetype" = "application/zip" ] ; then
             fifo_pager unzip -l "$1"
         elif [ "$ext" = "gz" ] || [ "$ext" = "bz2" ] ; then
@@ -222,6 +214,7 @@ if [ "$PREVIEW_MODE" ] ; then
         kitty @ last-used-layout --no-response >/dev/null 2>&1
     fi
 
+    rm $videothumb
     exit 0
 fi