commit 16a483388a58c4b70048f8a62b8877ff680e0f3e parent 0de9b90d71c05c7246fff902d74306d5a914e3f3 Author: Alex Balgavy <alex@balgavy.eu> Date: Sat, 27 Feb 2021 19:08:42 +0100 newsboat: fix macros that were calling youtube-dlc I'll just call youtube-dl and make a link to whatever fork I'm using. At the moment it's yt-dlp but who knows when that'll change. Diffstat:
| M | newsboat/config | | | 4 | ++-- |
| M | scripts/newsboat-dl | | | 6 | +++--- |
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/newsboat/config b/newsboat/config @@ -58,9 +58,9 @@ unbind-key , bind-key SPACE macro-prefix macro SPACE set browser "open -g %u"; open-in-browser; set browser "linkhandler %u" macro v set browser "linkhandler"; open-in-browser ; set browser "linkhandler %u" -macro a set browser "mpc add \"$(youtube-dlc -x -g %u)\" && mpc play"; open-in-browser; set browser "linkhandler %u" +macro a set browser "mpc add \"$(youtube-dl -x -g %u)\" && mpc play"; open-in-browser; set browser "linkhandler %u" macro w set browser "w3m -config ~/.config/w3m/config %u"; open-in-browser; set browser "linkhandler %u" -macro i set browser "youtube-dlc --get-title --get-duration --get-description %u | less"; open-in-browser; set browser "linkhandler %u" +macro i set browser "youtube-dl --get-title --get-duration --get-description %u | less"; open-in-browser; set browser "linkhandler %u" macro c set browser "printf '%s' %u | clc" ; open-in-browser ; set browser "linkhandler %u" macro u set browser "urlview"; open-in-browser ; set browser "linkhandler %u" macro l set browser "notify 'Downloading' %u 'bcdl' && setsid -f bcdl %u >/tmp/bcdl$(date +%s).log 2>&1"; open-in-browser; set browser "linkhandler %u" diff --git a/scripts/newsboat-dl b/scripts/newsboat-dl @@ -6,16 +6,16 @@ downloads="$HOME/Downloads/" audiodir="$downloads/newsboat/audio" videodir="$downloads/newsboat/video" logfile="$HOME/.cache/newsboat-download.log" -title=$(youtube-dlc --ignore-config --get-title --get-duration --get-description "$where" 2>/dev/null) +title=$(youtube-dl --ignore-config --get-title --get-duration --get-description "$where" 2>/dev/null) terminal-notifier -title "Started $what download" -message "Downloading \"$title\"" -group "$where" case "$what" in "aonly") mkdir -p "$audiodir" - youtube-dlc --add-metadata -xic -f bestaudio/best -o "$audiodir/%(title)s-%(creator)s.%(ext)s" "$where" 2>&1 >> "$logfile" + youtube-dl --add-metadata -xic -f bestaudio/best -o "$audiodir/%(title)s-%(creator)s.%(ext)s" "$where" 2>&1 >> "$logfile" ;; "av") - youtube-dlc --add-metadata -ic --write-sub --embed-subs -o "$videodir/%(title)s-%(creator)s.%(ext)s" "$where" 2>&1 >> "$logfile" + youtube-dl --add-metadata -ic --write-sub --embed-subs -o "$videodir/%(title)s-%(creator)s.%(ext)s" "$where" 2>&1 >> "$logfile" ;; *) terminal-notifier -title "Error" -message "Download option not valid" -group "$where"