update lfimg

2 files changed, 24 insertions, 34 deletions

diff --git a/lf/lfrc b/lf/lfrc
index df622de..0b5b5e8 100644
--- a/lf/lfrc
+++ b/lf/lfrc
@@ -254,14 +254,14 @@ map ,vv vimv
 
 
 # Not really image preview
-map - $~/.config/lf/draw_img "$f"
-
-cmd video_preview ${{
-    CACHE=$(mktemp /tmp/thumb_cache.XXXXX)
-    ffmpegthumbnailer -i "$f" -o $CACHE -s 0
-    ~/.config/lf/draw_img $CACHE && rm $CACHE
-}}
-map + :video_preview
+#map - $~/.config/lf/draw_img "$f"
+#
+#cmd video_preview ${{
+#    CACHE=$(mktemp /tmp/thumb_cache.XXXXX)
+#    ffmpegthumbnailer -i "$f" -o $CACHE -s 0
+#    ~/.config/lf/draw_img $CACHE && rm $CACHE
+#}}
+#map + :video_preview
 
 # File Openers
 map ee $$EDITOR "$f"
diff --git a/lf/preview b/lf/preview
index e24c381..0e2f7f0 100755
--- a/lf/preview
+++ b/lf/preview
@@ -1,8 +1,11 @@
 #!/bin/sh
+CACHE="$HOME/.cache/lf/thumbnail.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' \
+	-- "$(readlink -f "$1")" | sha256sum | awk '{print $1}'))"
 
 image() {
 	if [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
-		printf '{"action": "add", "identifier": "PREVIEW", "x": "%s", "y": "%s", "width": "%s", "height": "%s", "scaler": "contain", "path": "%s"}\n' "$4" "$5" "$(($2-1))" "$(($3-1))" "$1" > "$FIFO_UEBERZUG"
+		printf '{"action": "add", "identifier": "PREVIEW", "x": "%s", "y":"%s", "width": "%s", "height": "%s", "scaler": "contain", "path": "%s"}\n' \
+			"$4" "$5" "$(($2-1))" "$(($3-1))" "$1" > "$FIFO_UEBERZUG"
 		exit 1
 	else
 		chafa "$1" -s "$4x"
@@ -12,8 +15,7 @@ image() {
 batorcat() {
 	file="$1"
 	shift
-	if command -v bat > /dev/null 2>&1
-	then
+	if command -v bat > /dev/null 2>&1; then
 		bat --color=always --style=plain --pager=never "$file" "$@"
 	else
 		cat "$file"
@@ -23,16 +25,13 @@ batorcat() {
 glowormdcat() {
 	file="$1"
 	shift
-	if command -v glow > /dev/null 2>&1
-	then
+	if command -v glow > /dev/null 2>&1; then
 		glow "$file"
 	else
 		mdcat "$file"
 	fi
 }
 
-CACHE="$HOME/.cache/lf/thumbnail.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | awk '{print $1}'))"
-
 case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 	*.tgz|*.tar.gz) tar tzf "$1" ;;
 	*.tar.bz2|*.tbz2) tar tjf "$1" ;;
@@ -40,8 +39,7 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 	*.tar) tar tf "$1" ;;
 	*.zip|*.jar|*.war|*.ear|*.oxt) unzip -l "$1" ;;
 	*.rar) unrar l "$1" ;;
-  *.md) 
-  	glowormdcat "$1";;
+	*.md) glowormdcat "$1";;
 	*.7z) 7z l "$1" ;;
 	*.[1-8]) man "$1" | col -b ;;
 	*.o) nm "$1";;
@@ -50,7 +48,7 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 	*.odt|*.ods|*.odp|*.sxw) odt2txt "$1" ;;
 	*.doc) catdoc "$1" ;;
 	*.docx) docx2txt "$1" ;;
-  *.xml|*.html) w3m -dump "$1";;
+	*.xml|*.html) w3m -dump "$1";;
 	*.xls|*.xlsx)
 		ssconvert --export-type=Gnumeric_stf:stf_csv "$1" "fd://1" | batorcat --language=csv
 		;;
@@ -58,18 +56,15 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 		exiftool "$1"
 		;;
 	*.pdf)
-		[ ! -f "${CACHE}.jpg" ] && \
-			pdftoppm -jpeg -f 1 -singlefile "$1" "$CACHE"
+		[ ! -f "${CACHE}.jpg" ] && pdftoppm -jpeg -f 1 -singlefile "$1" "$CACHE"
 		image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
 		;;
 	*.epub)
-		[ ! -f "$CACHE" ] && \
-			epub-thumbnailer "$1" "$CACHE" 1024
+		[ ! -f "$CACHE" ] && epub-thumbnailer "$1" "$CACHE" 1024
 		image "$CACHE" "$2" "$3" "$4" "$5"
 		;;
 	*.cbz|*.cbr|*.cbt)
-		[ ! -f "$CACHE" ] && \
-			comicthumb "$1" "$CACHE" 1024
+		[ ! -f "$CACHE" ] && comicthumb "$1" "$CACHE" 1024
 		image "$CACHE" "$2" "$3" "$4" "$5"
 		;;
 	*.avi|*.mp4|*.wmv|*.dat|*.3gp|*.ogv|*.mkv|*.mpg|*.mpeg|*.vob|*.fl[icv]|*.m2v|*.mov|*.webm|*.ts|*.mts|*.m4v|*.r[am]|*.qt|*.divx)
@@ -80,16 +75,11 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
 	*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.tiff|*.gif|*.jfif|*.ico)
 		image "$1" "$2" "$3" "$4" "$5"
 		;;
-  *.svg)
-    [ ! -f "${CACHE}.jpg" ] && \
-      convert "$1" "${CACHE}.jpg"
-    image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
-    ;;
-	*.ino)
-		batorcat --language=cpp "$1"
-		;;
-	*)
-		batorcat "$1"
+	*.svg)
+		[ ! -f "${CACHE}.jpg" ] && convert "$1" "${CACHE}.jpg"
+		image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
 		;;
+	*.ino) batorcat --language=cpp "$1" ;;
+	*) batorcat "$1" ;;
 esac
 exit 0