mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-19 09:29:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add nsxiv support to nuke, preview-tabbed and imgview

Browse source 
`nuke` and `preview-tabbed` works as expected. I would assume `imgview`
should work as expected as well since `nsxiv` (at the moment at least)
is a drop-in replacement for sxiv, but I haven't tested it.

Closes: https://github.com/jarun/nnn/issues/1229
This commit is contained in:
NRK 2021-11-10 22:42:27 +06:00
parent f854b3c748
commit 39a3cc5309
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/imgview
View file

@ -6,6 +6,7 @@
# Dependencies: # Dependencies:
# - imv (https://github.com/eXeC64/imv) or, # - imv (https://github.com/eXeC64/imv) or,
# - sxiv (https://github.com/muennich/sxiv) or, # - sxiv (https://github.com/muennich/sxiv) or,
# - nsxiv (https://github.com/nsxiv/nsxiv) or,
# - ucollage (https://github.com/ckardaris/ucollage) or, # - ucollage (https://github.com/ckardaris/ucollage) or,
# - lsix (https://github.com/hackerb9/lsix), or # - lsix (https://github.com/hackerb9/lsix), or
# - viu (https://github.com/atanunq/viu), or # - viu (https://github.com/atanunq/viu), or
@ -62,6 +63,7 @@ listimages() {
view_files() { view_files() {
[ -f "$target" ] && count="-n $(listimages | grep -a -m 1 -ZznF "$target" | cut -d: -f1)" [ -f "$target" ] && count="-n $(listimages | grep -a -m 1 -ZznF "$target" | cut -d: -f1)"
case "$1" in case "$1" in
nsxiv) listimages | xargs -0 nsxiv -a "${count:--t}" -- ;;
sxiv) listimages | xargs -0 sxiv -a "${count:--t}" -- ;; sxiv) listimages | xargs -0 sxiv -a "${count:--t}" -- ;;
imv*) listimages | xargs -0 "$1" "${count:-}" -- ;; imv*) listimages | xargs -0 "$1" "${count:-}" -- ;;
esac esac
@ -86,6 +88,9 @@ elif type ucollage >/dev/null 2>&1; then
elif type sxiv >/dev/null 2>&1; then elif type sxiv >/dev/null 2>&1; then
type ffmpegthumbnailer >/dev/null 2>&1 && make_thumbs 0 type ffmpegthumbnailer >/dev/null 2>&1 && make_thumbs 0
view_files sxiv >/dev/null 2>&1 & view_files sxiv >/dev/null 2>&1 &
elif type nsxiv >/dev/null 2>&1; then
type ffmpegthumbnailer >/dev/null 2>&1 && make_thumbs 0
view_files nsxiv >/dev/null 2>&1 &
elif type imv >/dev/null 2>&1; then elif type imv >/dev/null 2>&1; then
make_thumbs "" make_thumbs ""
view_files imv >/dev/null 2>&1 & view_files imv >/dev/null 2>&1 &
@ -102,5 +107,5 @@ elif type catimg >/dev/null 2>&1; then
catimg "$ret" catimg "$ret"
exit_prompt exit_prompt
else else
exit_prompt "Please install sxiv/imv/viu/catimg/lsix." exit_prompt "Please install sxiv/nsxiv/imv/viu/catimg/lsix."
fi fi

5
plugins/nuke
View file

@ -51,7 +51,7 @@
# htm|html|xhtml: w3m, lynx, elinks # htm|html|xhtml: w3m, lynx, elinks
# json: jq, python (json.tool module) # json: jq, python (json.tool module)
# Multimedia by mime: # Multimedia by mime:
# image/*: imv/sxiv (GUI), viu (https://github.com/atanunq/viu), img2txt, exiftool # image/*: imv/sxiv/nsxiv (GUI), viu (https://github.com/atanunq/viu), img2txt, exiftool
# video/*: smplayer, mpv (GUI), ffmpegthumbnailer, mediainfo, exiftool # video/*: smplayer, mpv (GUI), ffmpegthumbnailer, mediainfo, exiftool
# audio/*: mocq (nnn plugin using MOC), mpv, media_client (Haiku), mediainfo, exiftool # audio/*: mocq (nnn plugin using MOC), mpv, media_client (Haiku), mediainfo, exiftool
# application/pdf: zathura (GUI), pdftotext, mutool, exiftool # application/pdf: zathura (GUI), pdftotext, mutool, exiftool
@ -324,6 +324,9 @@ handle_multimedia() {
elif type sxiv >/dev/null 2>&1; then elif type sxiv >/dev/null 2>&1; then
load_dir sxiv "${FPATH}" >/dev/null 2>&1 & load_dir sxiv "${FPATH}" >/dev/null 2>&1 &
exit 0 exit 0
elif type nsxiv >/dev/null 2>&1; then
load_dir nsxiv "${FPATH}" >/dev/null 2>&1 &
exit 0
fi fi
elif type viu >/dev/null 2>&1; then elif type viu >/dev/null 2>&1; then
viu -n "${FPATH}" | eval "$PAGER" viu -n "${FPATH}" | eval "$PAGER"

9
plugins/preview-tabbed
View file

@ -6,10 +6,11 @@
# - tabbed (https://tools.suckless.org/tabbed): xembed host # - tabbed (https://tools.suckless.org/tabbed): xembed host
# - xterm (or urxvt or st) : xembed client for text-based preview # - xterm (or urxvt or st) : xembed client for text-based preview
# - mpv (https://mpv.io): xembed client for video/audio # - mpv (https://mpv.io): xembed client for video/audio
# - sxiv (https://github.com/muennich/sxiv): xembed client for images # - sxiv (https://github.com/muennich/sxiv) or,
# - nsxiv (https://github.com/nsxiv/nsxiv) : xembed client for images
# - zathura (https://pwmt.org/projects/zathura): xembed client for PDF # - zathura (https://pwmt.org/projects/zathura): xembed client for PDF
# - nnn's nuke plugin for text preview and fallback # - nnn's nuke plugin for text preview and fallback
# nuke is a fallback for 'mpv', 'sxiv', and 'zathura', but has its # nuke is a fallback for 'mpv', 'sxiv'/'nsxiv', and 'zathura', but has its
# own dependencies, see the script for more information # own dependencies, see the script for more information
# - vim (or any editor/pager really) # - vim (or any editor/pager really)
# - file # - file
@ -35,7 +36,7 @@
# provided for `urxvt` and `st`). For graphic preview this can be trickier, # provided for `urxvt` and `st`). For graphic preview this can be trickier,
# but a few popular viewers are xembed-able, we use: # but a few popular viewers are xembed-able, we use:
# - `mpv`: multimedia player, for video/audio preview # - `mpv`: multimedia player, for video/audio preview
# - `sxiv`: image viewer # - `sxiv`/`nsxiv`: image viewer
# - `zathura`: PDF viewer # - `zathura`: PDF viewer
# - but we always fallback to `nuke` plugin # - but we always fallback to `nuke` plugin
# #
@ -155,6 +156,8 @@ previewer_loop () {
image/*) image/*)
if type sxiv >/dev/null 2>&1 ; then if type sxiv >/dev/null 2>&1 ; then
sxiv -e "$XID" "$FILE" & sxiv -e "$XID" "$FILE" &
elif type nsxiv >/dev/null 2>&1 ; then
nsxiv -e "$XID" "$FILE" &
else else
term_nuke "$XID" "$FILE" term_nuke "$XID" "$FILE"
fi fi