branch master updated: gnu: ytfzf: Fix loading of thumbnails.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

raghavgururajan pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new f480f27  gnu: ytfzf: Fix loading of thumbnails.
f480f27 is described below

commit f480f27c9c652c927e66d38a7183751303794711
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Wed Jul 7 01:53:39 2021 -0400

    gnu: ytfzf: Fix loading of thumbnails.
    
    * gnu/packages/patches/ytfzf-programs.patch: Modify.
---
 gnu/packages/patches/ytfzf-programs.patch | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/patches/ytfzf-programs.patch 
b/gnu/packages/patches/ytfzf-programs.patch
index 57bd7d4..005ce2c 100644
--- a/gnu/packages/patches/ytfzf-programs.patch
+++ b/gnu/packages/patches/ytfzf-programs.patch
@@ -1,21 +1,21 @@
-From 2118630fe9ac85f4e59135100047cdfb2683c81d Mon Sep 17 00:00:00 2001
+From 3f1eaf5a1645b28ca18cfa028417dc225b7a557f Mon Sep 17 00:00:00 2001
 From: Raghav Gururajan <rg@raghavgururajan.name>
 Date: Mon, 5 Jul 2021 06:45:49 -0400
-Subject: [PATCH 1/2] Modify the strings of referenced programs.
+Subject: [PATCH] Modify the strings of referenced programs.
 
 Pattern the strings of referenced programs, so that they can be easily
 substituted with absolute paths using a custom-phase.
 
 Co-authored-by: jgart <jgart@dismail.de>
 ---
- ytfzf | 204 +++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 102 insertions(+), 102 deletions(-)
+ ytfzf | 198 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 99 insertions(+), 99 deletions(-)
 
 diff --git a/ytfzf b/ytfzf
-index f4d2e0d..f0f2e16 100755
+index f4d2e0d..e8bb60b 100755
 --- a/ytfzf
 +++ b/ytfzf
-@@ -49,19 +49,19 @@ cache_dir=${YTFZF_CACHE-${cache_dir-$HOME/.cache/ytfzf}}
+@@ -49,17 +49,17 @@ cache_dir=${YTFZF_CACHE-${cache_dir-$HOME/.cache/ytfzf}}
  #video type preference (mp4/1080p, mp4/720p, etc..)
  video_pref=${YTFZF_PREF-${video_pref-}}
  #the menu to use instead of fzf when -D is specified
@@ -35,11 +35,8 @@ index f4d2e0d..f0f2e16 100755
 -audio_player=${YTFZF_AUDIO_PLAYER-${audio_player-mpv --no-video}}
 +audio_player=${YTFZF_AUDIO_PLAYER-${audio_player-@mpv@ --no-video}}
  #the command to use for displaying thumbnails
--thumb_disp_method=${YTFZF_THUMB_DISP_METHOD-${thumb_disp_method-ueberzug}}
-+thumb_disp_method=${YTFZF_THUMB_DISP_METHOD-${thumb_disp_method-@ueberzug@}}
+ thumb_disp_method=${YTFZF_THUMB_DISP_METHOD-${thumb_disp_method-ueberzug}}
  #Storing the argument and location for autogenerated subtitles
- [ -z "$YTFZF_SUBT_NAME" ] && YTFZF_SUBT_NAME=""
- #Stores the language for the auto genereated subtitles
 @@ -85,8 +85,8 @@ 
subscriptions_file=${subscriptions_file-$config_dir/subscriptions}
  #> stores the pid of running ytfzf sessions
  pid_file="$cache_dir/.pid"
@@ -307,7 +304,7 @@ index f4d2e0d..f0f2e16 100755
        ..|.playlistRenderer? |
        select(. !=null) |
                {
-@@ -904,31 +904,31 @@ get_search_query () {
+@@ -904,28 +904,28 @@ get_search_query () {
  #> To select videos from videos_data
  user_selection () {
        #remove subscription separators
@@ -332,8 +329,7 @@ index f4d2e0d..f0f2e16 100755
 -              dep_ck "ueberzug" "fzf"
 +              dep_ck "@ueberzug@" "@fzf@"
                export YTFZF_THUMB_DISP_METHOD="$thumb_disp_method"
--              [ "$thumb_disp_method" = "ueberzug" ] && start_ueberzug
-+              [ "$thumb_disp_method" = "@ueberzug@" ] && start_ueberzug
+               [ "$thumb_disp_method" = "ueberzug" ] && start_ueberzug
                #thumbnails only work in fzf, use fzf
 -              menu_command="fzf -m --tabstop=1 --bind change:top 
--delimiter=\"$tab_space\" \
 +              menu_command="@fzf@ -m --tabstop=1 --bind change:top 
--delimiter=\"$tab_space\" \
@@ -342,11 +338,7 @@ index f4d2e0d..f0f2e16 100755
 +              --layout=reverse --preview \"@sh@ $0 -U {}\" \
                --preview-window \"$PREVIEW_SIDE:50%:noborder:wrap\""
                selected_data=$( title_len=200 video_menu "$videos_data" )
--              [ "$thumb_disp_method" = "ueberzug" ] && stop_ueberzug
-+              [ "$thumb_disp_method" = "@ueberzug@" ] && stop_ueberzug
-               # Deletes thumbnails if no video is selected
-               [ -z "$selected_data" ] && clean_up
-       #show regular menu
+               [ "$thumb_disp_method" = "ueberzug" ] && stop_ueberzug
 @@ -951,10 +951,10 @@ handle_shortcuts () {
      case $selected_key in
        "$urls_shortcut") printf "%s\n" $selected_urls; return 1 ;;