From 71ecf9dfed746e51a1500be9c41c55c74173010b Mon Sep 17 00:00:00 2001 From: Kros Dai Date: Mon, 10 Jan 2022 00:44:44 +0800 Subject: [PATCH] Use `yt-dlp` instead of `youtube-dl` to resolve download speed limit ytdl-org/youtube-dl#29326 Signed-off-by: Kros Dai --- install.conf.yaml | 2 +- zsh/zshrc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/install.conf.yaml b/install.conf.yaml index ed357cd..4f30b26 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -29,4 +29,4 @@ - ./fzf/install --bin - cp ./diff-so-fancy/diff-so-fancy ./bin/diff-so-fancy && cp ./diff-so-fancy/lib/* ./bin/lib/ - clang -framework Carbon util/reset-input.m -o bin/reset-input - #- brew update && brew upgrade && brew install nodejs bat prettyping htop diff-so-fancy ncdu tldr ack ag fortune ponysay csvkit noti entr youtube-dl + #- brew update && brew upgrade && brew install nodejs bat prettyping htop diff-so-fancy ncdu tldr ack ag fortune ponysay csvkit noti entr youtube-dl aria2 yt-dlp diff --git a/zsh/zshrc b/zsh/zshrc index c61e906..dc335de 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -124,8 +124,12 @@ command -v htop &>/dev/null && alias top='sudo htop' command -v diff-so-fancy &>/dev/null && alias diff='diff-so-fancy' command -v ncdu &>/dev/null && alias du='ncdu --color dark -rr -x' command -v tldr &>/dev/null && alias help='tldr' -command -v youtube-dl &>/dev/null && alias youtube-dl="youtube-dl -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]' --write-sub --sub-lang 'zh-CN,zh-Hans,zh-TW,zh-Hant,en' --convert-subs 'srt' -o '%(uploader)s/%(playlist)s/%(playlist_index)03d.%(title)s.%(id)s.%(ext)s'" command -v jira &>/dev/null && eval "$(jira --completion-script-bash)" +if [ `command -v aria2c` ]; then + extargs="-ci --external-downloader aria2c --external-downloader-args '-s16 -x16 -k 4M' -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]' --write-sub --sub-lang 'zh-CN,zh-Hans,zh-TW,zh-Hant,en' --convert-subs 'srt' -o '%(uploader)s/%(playlist)s/%(playlist_index)03d.%(title)s.%(id)s.%(ext)s'" + command -v youtube-dl &>/dev/null && alias youtube-dl="youtube-dl $extargs" + command -v yt-dlp &>/dev/null && alias yt-dlp="yt-dlp $extargs" +fi source "$ZDOTDIR/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" source "$ZDOTDIR/iterm2_shell_integration.zsh"