diff --git a/scripts/vv b/scripts/vv old mode 100755 new mode 100644 index ba915d0..657a7cb --- a/scripts/vv +++ b/scripts/vv @@ -2,11 +2,11 @@ # vv: VT View -# Version 1.9.3 -# B9 May 2023 +# Version 1.9.4 +# B9 November 2024 # Use sixel graphics to show images inside a terminal (e.g., xterm). -# Copyright (c) 2019..2023 hackerb9, under the terms of GNU GPL 3+. +# Copyright (c) 2019..2024 hackerb9, under the terms of GNU GPL 3+. # Some nice features: # * Can display any image type. (Via ImageMagick). @@ -257,6 +257,16 @@ prerequisites() { echo "Pages: $(identify "$1" | grep -c PDF)" } fi + if command -v chrome >/dev/null; then + dumpdom() { chrome --headless --dump-dom "$@"; } + elif command -v chromium >/dev/null; then + dumpdom() { chromium --headless --dump-dom "$@"; } + else + dumpdom() { + notice "If yandex mistakes w3m for a bot, please install chrome to run headless javascript." + curl "$@" + } + fi if [[ $BASH_VERSINFO -lt 5 ]]; then notice "Kludging read for Bash4" BASH4BUG="-e" @@ -540,7 +550,7 @@ inittermkey() { # To be valid, we must enable terminal application mode key sequences. if tput smkx; then - for k in $(infocmp -L1 | egrep 'key_|cursor_'); do + for k in $(infocmp -L1 | grep -E 'key_|cursor_'); do a=""; x="" # Example "k: key_down=\EOB," a=${k#*key_} @@ -758,7 +768,6 @@ sidebyside() { -auto-orient \ -geometry ">${half}x>$((height-fontheight))" \ -label "$1" "$1" -label "$2" "$2" sixel:- - viewmode=ss SHOULDREDRAW=yup } @@ -821,7 +830,8 @@ reverseimagesearch() { yandeximagesearch() { # Reverse image search using yandex and w3m # Yandex is not the best but has a simple interface we can access - # without javascript. (Unlike Tineye, Bing, and Google.) + # (Unlike Tineye, Bing, and Google). Yandex does require + # javascript, so we use 'chrome --dump-dom' to retrieve the html. local file="$1" local output resultPage deleteme="" # Local vars local scale=">1000x>1000" # Image size to scale to before searching. @@ -838,7 +848,7 @@ yandeximagesearch() { url="https://yandex.com/images/search?rpt=imageview" url+="&format=json" url+='&request=%7B%22blocks%22%3A%5B%7B%22block%22%3A%22cbir-controller__upload%3Aajax%22%7D%5D%7D' - cookie="yp=999999999999.sp.aflt%3A999999999999.szm.1; my=YywBAAA=" + cookie="" # Upload the image and save the output to search through. # Note: Curl's "@filename" splits filenames with commas & semicolons. @@ -872,8 +882,11 @@ yandeximagesearch() { if [[ "$resultPage" ]]; then - echo "Found $(unuriescape "$resultPage")" >&2 - w3m https://yandex.com$resultPage + echo "Found yandex.com/$(unuriescape "$resultPage")" >&2 + dumpdom https://yandex.com$resultPage | + sed 's|||' > "$tmpdir/yandex.html" + w3m "$tmpdir/yandex.html" + rm "$tmpdir/yandex.html" 2>/dev/null else echo "Error parsing results from Yandex." >&2 fi @@ -1184,10 +1197,10 @@ fakefile() { showimage() { # Shows the file named in $1 using sixel. - # Global variable $viewmode is either "full", which enlarges it to - # the full size of the terminal window, or it is "fast", which - # scales the image down, removes colors, and takes other shortcuts - # for the fastest preview. + # Global variable $viewmode is (usually) either "full", which + # enlarges it to the full size of the terminal window, or it is + # "fast", which scales the image down, removes colors, and takes + # other shortcuts for the fastest preview. # Note that "full size" is not exactly the same as "full screen". # In a terminal emulator, the sixel graphics are just a window. @@ -1319,7 +1332,8 @@ showimage() { esac tput el if [[ "$output" ]]; then - echo -n "$output" + local ST=$'\e\\\\' # String Terminator is Esc \. + echo -n "$output" | sed "s/-${ST}/${ST}\n/g" # (sed kludge for bug in IM 6.9.12) SHOULDREDRAW="" # Reset redraw flag until SIGWINCH trips it else # Error. ImageMagick must have failed as $output is empty. @@ -1447,10 +1461,11 @@ doit () { # Use read timeout to check several times a second for window resize. REPLY= while [[ -z $REPLY && -z $SHOULDREDRAW ]]; do - read $BASH4BUG -s -n1 -t 0.25 < /dev/tty - local e=$? - if [[ $e -gt 0 ]]; then + if read $BASH4BUG -s -n1 -t 0.25 < /dev/tty; then + break + else # Read command returned an error (usually timeout). + local e=$? if [[ "$slideshow" ]]; then if doslideshow "$f"; then continue 3 # User hit q to quit vv @@ -1814,12 +1829,14 @@ dotfordot() { ### Show pieces + local ST=$'\e\\\\' # String Terminator is Esc \. local IFS=$'\n' for f in $(ls -1v $tmpdir/*crop.ppm); do echo -en "$f\r" convert "$f" "$f.sixel" - cat "$f.sixel" - done + cat "$f.sixel" | sed "s/-${ST}/${ST}\n/g" # (sed kludge for bug in IM 6.9.12) + done + ### All done rm $tmpdir/*crop.*