Skip to content

Commit c5877c5

Browse files
Lockl00p71zenith
andauthored
fix: mac os downloading (#1517)
Co-authored-by: zen <[email protected]>
1 parent d6ae482 commit c5877c5

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

ani-cli

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
version_number="4.10.0"
3+
version_number="4.10.1"
44

55
# UI
66

@@ -153,8 +153,8 @@ get_links() {
153153
extract_link=$(printf "%s" "$episode_link" | head -1 | cut -d'>' -f2)
154154
relative_link=$(printf "%s" "$extract_link" | sed 's|[^/]*$||')
155155
m3u8_streams="$(curl -e "$m3u8_refr" -s "$extract_link" -A "$agent")"
156-
printf "%s" "$m3u8_streams" | grep -q "EXTM3U" && printf "%s" "$m3u8_streams" | sed 's|^#EXT-X-STREAM.*x||g; s|,.*|p|g; /^#/d; $!N; s|\
157-
| >|;/EXT-X-I-FRAME/d' | sed "s|>|cc>${relative_link}|g" | sort -nr
156+
printf "%s" "$m3u8_streams" | grep -q "EXTM3U" && printf "%s" "$m3u8_streams" | sed 's|^#EXT-X-STREAM.*x||g; s|,.*|p|g; /^#/d; $!N; s|\n| >|;/EXT-X-I-FRAME/d' |
157+
sed "s|>|cc>${relative_link}|g" | sort -nr
158158
printf '%s' "$response" | sed -nE 's|.*"subtitles":\[\{"lang":"en","label":"English","default":"default","src":"([^"]*)".*|subtitle >\1|p' >"$cache_dir/suburl"
159159
;;
160160
*) [ -n "$episode_link" ] && printf "%s\n" "$episode_link" ;;
@@ -295,7 +295,8 @@ download() {
295295
# [ -e "$download_dir/$2.vtt" ] && ffmpeg -i "$download_dir/$2.mp4" -i "$download_dir/$2.vtt" -c copy -c:s mov_text "$download_dir/$2.bak.mp4" && mv "$download_dir/$2.bak.mp4" "$download_dir/$2.mp4"
296296
;;
297297
*)
298-
aria2c --referer="$allanime_refr" --enable-rpc=false --check-certificate=false --continue --async-dns=false --summary-interval=0 -x 16 -s 16 "$1" --dir="$download_dir" -o "$2.mp4" --download-result=hide
298+
# shellcheck disable=SC2086
299+
aria2c --referer="$allanime_refr" --enable-rpc=false --check-certificate=false --continue $iSH_DownFix --summary-interval=0 -x 16 -s 16 "$1" --dir="$download_dir" -o "$2.mp4" --download-result=hide
299300
;;
300301
esac
301302
}
@@ -321,7 +322,11 @@ play_episode() {
321322
;;
322323
android_mpv) nohup am start --user 0 -a android.intent.action.VIEW -d "$episode" -n is.xyz.mpv/.MPVActivity >/dev/null 2>&1 & ;;
323324
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 & ;;
324-
*iina*) nohup $player_function --no-stdin --keep-running --mpv-force-media-title="${allanime_title}Episode ${ep_no}" $subs_flag $refr_flag "$episode" >/dev/null 2>&1 & ;;
325+
*iina*)
326+
[ -n "$subs_flag" ] && subs_flag="--mpv-${subs_flag#--}"
327+
[ -n "$refr_flag" ] && refr_flag="--mpv-${refr_flag#--}"
328+
nohup $player_function --no-stdin --keep-running --mpv-force-media-title="${allanime_title}Episode ${ep_no}" $subs_flag $refr_flag "$episode" >/dev/null 2>&1 &
329+
;;
325330
flatpak_mpv) flatpak run io.mpv.Mpv --force-media-title="${allanime_title}Episode ${ep_no}" "$episode" $subs_flag $refr_flag >/dev/null 2>&1 & ;;
326331
vlc*) nohup $player_function --http-referrer="${allanime_refr}" --play-and-exit --meta-title="${allanime_title}Episode ${ep_no}" "$episode" >/dev/null 2>&1 & ;;
327332
*yncpla*) nohup $player_function "$episode" -- --force-media-title="${allanime_title}Episode ${ep_no}" $subs_flag $refr_flag >/dev/null 2>&1 & ;;
@@ -429,7 +434,10 @@ while [ $# -gt 0 ]; do
429434
shift
430435
;;
431436
-c | --continue) search=history ;;
432-
-d | --download) player_function=download ;;
437+
-d | --download)
438+
[ "$player_function" = "iSH" ] && iSH_DownFix="--async-dns=false"
439+
player_function=download
440+
;;
433441
-D | --delete)
434442
: >"$histfile"
435443
exit 0

0 commit comments

Comments
 (0)