Skip to content

feat: add mpv playlist support #1755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbpowers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add mpv playlist support #1755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 89 additions & 15 deletions ani-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

version_number="4.14.1"
version_number="4.15.1"

# UI

Expand Down Expand Up @@ -70,6 +70,8 @@ help_info() {
Show this help message and exit
-e, --episode, -r, --range
Specify the number of episodes to watch
-p, --playlist
Playlist episodes in same instance (mpv only)
--dub
Play dubbed version
--rofi
Expand Down Expand Up @@ -140,6 +142,7 @@ where_mpv() {

cleanup() {
[ "$player_function" = "android_mpv" ] && : >"/storage/emulated/0/mpv/mpv.config.mp4"
[ -n "$playlist" ] && rm -f "$MPV_SOCKET"
printf "\033[0m" # clears colors
rm -f "${histfile}.new" # remove temp logfile
}
Expand Down Expand Up @@ -309,10 +312,18 @@ get_episode_url() {
cache_dir="$(mktemp -d)"
#providers="1 2 3 4 5"
providers="1 2 3 4"
pids=""
for provider in $providers; do
generate_link "$provider" >"$cache_dir"/"$provider" &
pids="$pids $!"
done
wait
if [ -n "$playlist" ]; then
for pid in $pids; do
wait "$pid"
done
else
wait
fi
# select the link with matching quality
links=$(cat "$cache_dir"/* | sort -g -r -s)
rm -r "$cache_dir"
Expand Down Expand Up @@ -392,6 +403,51 @@ download() {
esac
}

mpv_playlist_init() {
mpv_playlist_socket=$(mktemp /tmp/mpv-playlist.XXXXXX.sock)
rm -f "$mpv_playlist_socket"

play_mpv
mpv_playlist_pid=$!

while [ ! -S "$mpv_playlist_socket" ]; do sleep 0.1; done
}

mpv_playlist_wait() {
# waits for IPC signal and checks you reached the end of the playlist
# before breaking to allow loading of another episode
fifo="/tmp/mpv_fifo.$$"
mkfifo "$fifo" || return 1

socat -u UNIX-CONNECT:"$mpv_playlist_socket" "$fifo" >/dev/null 2>&1 &
SOCAT_PID=$!

while IFS= read -r line ; do
if ! kill -0 "$mpv_playlist_pid" 2>/dev/null; then mpv_playlist_quit=true; fi

event=$(printf '%s\n' "$line" | sed -n 's/.*"event":"\([^"]*\)".*/\1/p')
[ "$event" != "end-file" ] && continue

reason=$(printf '%s\n' "$line" | sed -n 's/.*"reason":"\([^"]*\)".*/\1/p')
[ "$reason" = "quit" ] && mpv_playlist_quit=true && return

playlist_pos=$(send_mpv_ipc '{"command":["get_property","playlist-pos"]}')
playlist_count=$(send_mpv_ipc '{"command":["get_property","playlist-count"]}')
playlist_pos=$(printf '%s\n' "$playlist_pos" | sed -n 's/.*"data":[ ]*\([0-9]*\).*/\1/p')
playlist_count=$(printf '%s\n' "$playlist_count" | sed -n 's/.*"data":[ ]*\([0-9]*\).*/\1/p')
[ "$playlist_pos" -ne $((playlist_count - 1)) ] && continue

break
done < "$fifo"

kill "$SOCAT_PID" 2>/dev/null
rm -f "$fifo"
}

send_mpv_ipc() {
printf '%s\n' "$1" | socat - UNIX-CONNECT:"$mpv_playlist_socket"
}

android_mpv() {
dir="/storage/emulated/0/mpv"
file="$dir/mpv.config.mp4"
Expand All @@ -403,40 +459,55 @@ android_mpv() {
unset dir file
}

play_mpv() {
if [ "$no_detach" = 0 ]; then
nohup $player_function $skip_flag $refr_flag --tls-verify=no --force-media-title="$media_title" ${playlist:+--input-ipc-server="$mpv_playlist_socket"} "$episode" >/dev/null 2>&1 &
else
$player_function $skip_flag $refr_flag --tls-verify=no --force-media-title="$media_title" ${playlist:+--input-ipc-server="$mpv_playlist_socket"} "$episode"
mpv_exitcode=$?
[ "$exit_after_play" = 1 ] && [ -z "$range" ] && exit "$mpv_exitcode"
fi
}

play_episode() {
[ "$log_episode" = 1 ] && [ "$player_function" != "debug" ] && [ "$player_function" != "download" ] && command -v logger >/dev/null && logger -t ani-cli "${allanime_title}${ep_no}"
[ "$skip_intro" = 1 ] && skip_flag="$(ani-skip -q "$mal_id" -e "$ep_no")"
[ -z "$episode" ] && get_episode_url
media_title="${allanime_title}Episode ${ep_no}"
# shellcheck disable=SC2086
case "$player_function" in
debug)
printf "All links:\n%s\nSelected link:\n" "$links"
printf "%s\n" "$episode"
;;
mpv*)
if [ "$no_detach" = 0 ]; then
nohup $player_function $skip_flag --tls-verify=no --force-media-title="${allanime_title}Episode ${ep_no}" "$episode" $refr_flag >/dev/null 2>&1 &
if [ -n "$playlist" ]; then
if [ -z "$mpv_playlist_pid" ] || ! kill -0 "$mpv_playlist_pid"; then
mpv_playlist_init
else
[ -z "$episode" ] && return
send_mpv_ipc "{\"command\":[\"loadfile\",\"$episode\",\"append-play\",-1,{\"force-media-title\":\"$media_title\"}]}" >/dev/null 2>&1
mpv_playlist_wait
fi
else
$player_function $skip_flag $refr_flag --tls-verify=no --force-media-title="${allanime_title}Episode ${ep_no}" "$episode"
mpv_exitcode=$?
[ "$exit_after_play" = 1 ] && [ -z "$range" ] && exit "$mpv_exitcode"
play_mpv
fi
;;
android_mpv) "$player_function" "$episode" "${allanime_title}Episode ${ep_no}" "--tls-verify=no $refr_flag" 2>&1 & ;;
android_vlc) nohup am start --user 0 -a android.intent.action.VIEW -d "$episode" -n org.videolan.vlc/org.videolan.vlc.gui.video.VideoPlayerActivity -e "title" "${allanime_title}Episode ${ep_no}" >/dev/null 2>&1 & ;;
android_mpv) "$player_function" "$episode" "$media_title" "--tls-verify=no $refr_flag" 2>&1 & ;;
android_vlc) nohup am start --user 0 -a android.intent.action.VIEW -d "$episode" -n org.videolan.vlc/org.videolan.vlc.gui.video.VideoPlayerActivity -e "title" "$media_title" >/dev/null 2>&1 & ;;
*iina*)
[ -n "$refr_flag" ] && refr_flag="--mpv-${refr_flag#--}"
if pgrep -f "IINA" >/dev/null 2>&1; then
# omit --keep-running when an IINA instance exists to prevent hanging
nohup $player_function --no-stdin --mpv-tls-verify=no --mpv-force-media-title="${allanime_title}Episode ${ep_no}" $refr_flag "$episode" >/dev/null 2>&1 &
nohup $player_function --no-stdin --mpv-tls-verify=no --mpv-force-media-title="$media_title" $refr_flag "$episode" >/dev/null 2>&1 &
else
nohup $player_function --no-stdin --mpv-tls-verify=no --keep-running --mpv-force-media-title="${allanime_title}Episode ${ep_no}" $refr_flag "$episode" >/dev/null 2>&1 &
nohup $player_function --no-stdin --mpv-tls-verify=no --keep-running --mpv-force-media-title="$media_title" $refr_flag "$episode" >/dev/null 2>&1 &
fi
;;
flatpak_mpv) flatpak run io.mpv.Mpv --tls-verify=no --force-media-title="${allanime_title}Episode ${ep_no}" "$episode" $refr_flag >/dev/null 2>&1 & ;;
vlc*) nohup $player_function --http-referrer="${refr_flag#--referrer=}" --play-and-exit --meta-title="${allanime_title}Episode ${ep_no}" "$episode" >/dev/null 2>&1 & ;;
*yncpla*) nohup $player_function "$episode" -- --tls-verify=no --force-media-title="${allanime_title}Episode ${ep_no}" $refr_flag >/dev/null 2>&1 & ;;
download) "$player_function" "$episode" "${allanime_title}Episode ${ep_no}" ;;
flatpak_mpv) flatpak run io.mpv.Mpv --tls-verify=no --force-media-title="$media_title" "$episode" $refr_flag >/dev/null 2>&1 & ;;
vlc*) nohup $player_function --http-referrer="${refr_flag#--referrer=}" --play-and-exit --meta-title="$media_title" "$episode" >/dev/null 2>&1 & ;;
*yncpla*) nohup $player_function "$episode" -- --tls-verify=no --force-media-title="$media_title" $refr_flag >/dev/null 2>&1 & ;;
download) "$player_function" "$episode" "$media_title" ;;
catt) nohup catt cast "$episode" >/dev/null 2>&1 & ;;
iSH)
printf "\e]8;;vlc://%s\a~~~~~~~~~~~~~~~~~~~~\n~ Tap to open VLC ~\n~~~~~~~~~~~~~~~~~~~~\e]8;;\a\n" "$episode"
Expand All @@ -446,6 +517,7 @@ play_episode() {
esac
replay="$episode"
unset episode
[ -n "$mpv_playlist_quit" ] && ep_no=$(( ep_no - 1 )) && return
update_history
[ "$use_external_menu" = "1" ] && wait
[ "$use_external_menu" = "2" ] && wait
Expand All @@ -464,6 +536,7 @@ play() {
range=$(printf "%s\n" "$ep_list" | sed -nE "/^${start}\$/,/^${end}\$/p")
[ -z "$range" ] && die "Invalid range!"
for i in $range; do
if [ -n "$mpv_playlist_quit" ]; then [ -n "$exit_after_play" ] && exit || return; fi
tput clear
ep_no=$i
printf "\33[2K\r\033[1;34mPlaying episode %s...\033[0m\n" "$ep_no"
Expand Down Expand Up @@ -566,6 +639,7 @@ while [ $# -gt 0 ]; do
ep_no="$2"
shift
;;
-p | --playlist) playlist=true ;;
--dub) mode="dub" ;;
--no-detach) no_detach=1 ;;
--exit-after-play) exit_after_play=1 && no_detach=1 ;;
Expand Down