From 81e6ecd8299b3014818a6eebec152cbf0ff247a2 Mon Sep 17 00:00:00 2001
From: Mori Zen <71zenith@proton.me>
Date: Wed, 18 Sep 2024 23:04:43 +0530
Subject: [PATCH] fix: where_mpv checks for mpv than ANI_CLI_PLAYER (#1424)

Co-authored-by: port19 <port19@port19.xyz>
---
 .github/workflows/ani-cli.yml |  2 +-
 ani-cli                       | 23 +++++++----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ani-cli.yml b/.github/workflows/ani-cli.yml
index fb9694b6b..69292b5a4 100644
--- a/.github/workflows/ani-cli.yml
+++ b/.github/workflows/ani-cli.yml
@@ -5,7 +5,7 @@ on:
       - master
   pull_request:
     paths:
-      - "/ani-cli"
+      - "**ani-cli"
 
 jobs:
   sh-checker:
diff --git a/ani-cli b/ani-cli
index 18da3f674..f56ff7041 100755
--- a/ani-cli
+++ b/ani-cli
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version_number="4.9.1"
+version_number="4.9.2"
 
 # UI
 
@@ -116,16 +116,13 @@ dep_ch() {
 }
 
 where_iina() {
-    [ -n "$ANI_CLI_PLAYER" ] && printf "%s" "$ANI_CLI_PLAYER" && return 0
-    command -v iina >/dev/null && printf "iina" && return 0
     [ -e "/Applications/IINA.app/Contents/MacOS/iina-cli" ] && echo "/Applications/IINA.app/Contents/MacOS/iina-cli" && return 0
-    dep_ch iina # exit with formating
+    printf "%s" "iina" && return 0
 }
 
 where_mpv() {
-    command -v "$ANI_CLI_PLAYER" >/dev/null && printf "%s" "$ANI_CLI_PLAYER" && return 0
     command -v "flatpak" >/dev/null && flatpak info io.mpv.Mpv >/dev/null 2>&1 && printf "%s" "flatpak_mpv" && return 0
-    dep_ch mpv # exit with formating
+    printf "%s" "mpv" && return 0
 }
 
 # SCRAPING
@@ -339,17 +336,11 @@ download_dir="${ANI_CLI_DOWNLOAD_DIR:-.}"
 log_episode="${ANI_CLI_LOG:-1}"
 quality="${ANI_CLI_QUALITY:-best}"
 case "$(uname -a)" in
-    *Darwin*)                                                         # mac OS
-        player_function="$(where_iina)"
-        [ $? -eq 0 ] || exit $?
-        ;;
+    *Darwin*) player_function="${ANI_CLI_PLAYER:-$(where_iina)}" ;;   # mac OS
     *ndroid*) player_function="${ANI_CLI_PLAYER:-android_mpv}" ;;     # Android OS (termux)
     *MINGW* | *WSL2*) player_function="${ANI_CLI_PLAYER:-mpv.exe}" ;; # Windows OS
     *ish*) player_function="${ANI_CLI_PLAYER:-iSH}" ;;                # iOS (iSH)
-    *)                                                                # Linux OS
-        player_function="${ANI_CLI_PLAYER:-$(where_mpv)}"
-        [ $? -eq 0 ] || exit $?
-        ;;
+    *) player_function="${ANI_CLI_PLAYER:-$(where_mpv)}" ;;           # Linux OS
 esac
 
 no_detach="${ANI_CLI_NO_DETACH:-0}"
@@ -444,8 +435,8 @@ case "$player_function" in
     download) dep_ch "ffmpeg" "aria2c" ;;
     android*) printf "\33[2K\rChecking of players on Android is disabled\n" ;;
     *iSH*) printf "\33[2K\rChecking of players on iOS is disabled\n" ;;
-    *iina*) true ;; # handled out of band in where_iina
-    *mpv*) true ;; # handled out of band in where_mpv
+    *IINA*) true ;;      # handled out of band in where_iina
+    flatpak_mpv) true ;; # handled out of band in where_mpv
     *) dep_ch "$player_function" ;;
 esac