diff options
Diffstat (limited to 'ar/.local/bin/qndl')
| -rwxr-xr-x | ar/.local/bin/qndl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ar/.local/bin/qndl b/ar/.local/bin/qndl index 80b90ff..2ab96c2 100755 --- a/ar/.local/bin/qndl +++ b/ar/.local/bin/qndl @@ -120,7 +120,7 @@ enqueue() { tsp -D "$_idnum" notify-send "✅ ${_dl_type} download complete:" "$_url" # Failure notification — waits for job, checks its exit status - tsp bash -c 'tsp -w "$1"; _exit=$(tsp -i "$1" | sed -n "s/.*exited with status //p"); [ "$_exit" != "0" ] && notify-send "❌ Failed to download:" "$2"' -- "$_idnum" "$_url" + tsp bash -c 'tsp -w "$1"; _exit=$(tsp -i "$1" | sed -n "s/.*exit code //p"); [ -n "$_exit" ] && [ "$_exit" != "0" ] && notify-send "❌ Failed to download:" "$2"' -- "$_idnum" "$_url" if [ "$_dl_type" = "music" ]; then tsp -D "$_idnum" bash -c "mpc update --wait && find '$_music_dir' -name '*.mp3' | sed 's|$_music_dir/||' | sort > '$HOME/.config/mpd/playlists/entire.m3u'" @@ -177,7 +177,7 @@ download_music() { _url="$1" _output_dir="${XDG_MUSIC_DIR:-$HOME/Music}" _archive="${XDG_DOTFILES_DIR:-$HOME/.dotfiles}/global/Music/.music.txt" - _format="${_output_dir}/%(album_artist,artist|Unknown Artist)s/%(album|Unknown Album)s/%(title)s.%(ext)s" + _format="${_output_dir}/%(channel|Unknown Artist)s/%(album|Unknown Album)s/%(title)s.%(ext)s" _pl_result="$(handle_playlist "$_url" "music" "$_output_dir" "$_format")" _pl_flag="$(printf '%s' "$_pl_result" | head -n 1)" @@ -188,6 +188,7 @@ download_music() { enqueue "music" "$_url" \ "$_pl_flag" \ + --replace-in-metadata channel '\.$' '' \ --extract-audio \ --audio-format best \ --audio-quality 0 \ @@ -252,7 +253,7 @@ download_video() { restore_archive() { _output_dir="${XDG_MUSIC_DIR:-$HOME/Music}" _archive="${XDG_DOTFILES_DIR:-$HOME/.dotfiles}/global/Music/.music.txt" - _format="${_output_dir}/%(album_artist,artist|Unknown Artist)s/%(album|Unknown Album)s/%(title)s.%(ext)s" + _format="${_output_dir}/%(channel|Unknown Artist)s/%(album|Unknown Album)s/%(title)s.%(ext)s" [ ! -f "$_archive" ] && die "⛔ Archive not found" "$_archive" |