From aa8685ba161b0ec19970e8474e71272ffe794a6f Mon Sep 17 00:00:00 2001 From: Thanos Apollo Date: Fri, 18 Aug 2023 07:29:52 +0300 Subject: dont use socat path as global variable --- yeetube.el | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'yeetube.el') diff --git a/yeetube.el b/yeetube.el index d23be55..f8565bb 100644 --- a/yeetube.el +++ b/yeetube.el @@ -127,8 +127,6 @@ It's recommended you keep it as the default value." (defvar yeetube-yt-dlp (executable-find "yt-dlp")) -(defvar yeetube-socat (executable-find "socat")) - (defvar yeetube-content nil) (defvar yeetube-saved-videos nil) @@ -231,14 +229,15 @@ It's recommended you keep it as the default value." (defun yeetube-toggle-pause-mpv () "Toggle play/pause mpv." (interactive) - (unless yeetube-socat (error "Required program 'socat' not found")) - (unless (string-match "mpv" yeetube-player) - (error "Not using mpv as yeetube-player")) - (when (and (string-match "mpv" yeetube-player) yeetube-socat) - (shell-command - (format "echo '{ \"command\": [\"cycle\", \"pause\"] }' | %s - %s" - yeetube-socat yeetube-mpv-socket)) - (message "mpv toggle pause"))) + (let ((socat (executable-find "socat"))) + (unless socat (error "Required program 'socat' not found")) + (unless (string-match "mpv" yeetube-player) + (error "Not using mpv as yeetube-player")) + (when (and (string-match "mpv" yeetube-player) socat) + (shell-command + (format "echo '{ \"command\": [\"cycle\", \"pause\"] }' | %s - %s" + socat yeetube-mpv-socket)) + (message "mpv toggle pause")))) ;; Usually titles from youtube get messed up, ;; This should fix some of the common issues. @@ -339,7 +338,7 @@ It's recommended you keep it as the default value." (- view-count-end 1)))) ;; Don't remove this! (search-backward "videoid") - ;; Just in case something gets messed + ;; show livestreams views as nil (if (string-match-p "text" view-count) (push `(,videoid ,title "nil") yeetube-content) (push `(,videoid ,title ,view-count) yeetube-content)))))))))) -- cgit v1.2.3