diff --git a/yt-music b/yt-music index 1dbd2fd..551b68e 100755 --- a/yt-music +++ b/yt-music @@ -66,14 +66,14 @@ loop(){ while true;do sleep 4 pos=$(echo '{ "command": ["get_property", "time-remaining"]}' | socat - /tmp/mpvsocket | sed -nE 's_.*data":([^\.]*).*_\1_p') - while [ "$pos" -gt 4 ];do + while [ -n "$pos" ];do pos=$(echo '{ "command": ["get_property", "time-remaining"]}' | socat - /tmp/mpvsocket | sed -nE 's_.*data":([^\.]*).*_\1_p') [ -z "$1" ] || printf "\033[2K\rnext music in $pos second(s)%s" "$(echo '{ "command": ["get_property", "pause"]}' | socat - /tmp/mpvsocket | sed -nE 's_.*data":([^,]*).*_\1_p' | sh && printf " (paused)")" [ -z "$pos" ] && printf "\033[2K\r\n" sleep 2 done pos=$(echo '{ "command": ["get_property", "time-remaining"]}' | socat - /tmp/mpvsocket | sed -nE 's_.*data":([^\.]*).*_\1_p') - ([ "$pos" -lt 3 ] || [ -z "$pos" ]) && pgrep -f "mpvsocket" > /dev/null && [ -n "$(cat "$logdir/next")" ] && play "$(shuf -n1 "$logdir/next")" "$1" + [ -z "$pos" ] && pgrep -f "mpvsocket" > /dev/null && [ -n "$(cat "$logdir/next")" ] && play "$(shuf -n1 "$logdir/next")" "$1" done } @@ -121,7 +121,6 @@ play(){ curl -s "https://i.ytimg.com/vi/$id/hqdefault.jpg" -o - | convert - -crop 270x270+105+45 "$logdir/default.jpg" && notify-send -i "$logdir/default.jpg" "Now Playing" "$title" -t 5000 pgrep -f "mpvsocket" > /dev/null || (setsid -f mpv --really-quiet --input-ipc-server=/tmp/mpvsocket --idle --quiet >/dev/null && sleep 1) echo "{ \"command\": [\"loadfile\", \"$audio_url\", \"replace\"] }" | socat - /tmp/mpvsocket - pgrep -f "yt-music loop" || echo '{"command" : ["run" ,"/home/tanveer/repos_scripts/yt-music","loop"]}' | socat - /tmp/mpvsocket cut -d':' -f2 "$logdir/current" > "$logdir/prev" prev_id=$(cut -d'>' -f2 "$logdir/prev") printf "currently playing : %s >%s\n" "$title" "$id" > "$logdir/current" @@ -135,6 +134,7 @@ play(){ \"context\": $(cat "$logdir/context") }" get_data "next" "$json_next" | sed 's/playlistPanelVideoRenderer/\n/g' | sed -nE 's_.*text":"(.*)"}.*longBylineText":\{"runs":\[\{"text":"([^"]*)","navigationEndpoint.*videoId":"([^"]*)".*_\1 - \2\t\3_p' | sed "/$id/d;/$prev_id/d" > "$next_data" & + pgrep -f "yt-music loop" || setsid -f $HOME/repos_scripts/yt-music loop } search_play(){ @@ -156,8 +156,8 @@ search_play(){ play_next(){ #call this by script-name "play_next" for playing next song immediately #or add "menu" after "play_next" to show menu for selecting and playing next song immediately - #like this script-namr "play_next" "menu" - [ -z "$1" ] && play "$(shuf -n1 "$logdir/next")" "verbose" || ( notify-send -i "$logdir/default.jpg" "$(cut -d">" -f1 "$logdir/current" | tr ':' '\n')" && play "$(menu "YT-music [play-next]: " < "$logdir/next")" "verbose") + #like this script-name "play_next" "menu" + [ -z "$1" ] && play "$(shuf -n1 "$logdir/next")" "verbose" || (pgrep -f "mpvsocket" && notify-send -i "$logdir/default.jpg" "$(cut -d">" -f1 "$logdir/current" | tr ':' '\n')" && play "$(menu "YT-music [play-next]: " < "$logdir/next")" "verbose") } menu(){ @@ -169,7 +169,7 @@ base_url="https://music.youtube.com" [ -d "$logdir" ] || mkdir "$logdir" cookie="$logdir/cookies" next_data="$logdir/next" -agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36" +agent="Mozilla/5.0 (X11; Linux x86_64; rv:108.0) Gecko/20100101 Firefox/108.0" #call this script by script-name "function_name" "query" [ -z "$1" ] && help "$@"