X-Git-Url: http://dolda2000.com/gitweb/?p=utils.git;a=blobdiff_plain;f=planime;h=20b651e4d197eeb53f85bab2728c15215764755e;hp=dfb8d64ad4293068c4d7ef641b2b9a1180ff3987;hb=dbf61e61b53f747b6eb10f0732d7ddccff3d3289;hpb=9fc0aa3b64b75da6ea44b8cba44c72f253fee6d5

diff --git a/planime b/planime
index dfb8d64..20b651e 100755
--- a/planime
+++ b/planime
@@ -14,11 +14,25 @@ scorefile() {
     fi
 }
 
+findbase() {
+    if [ -r aliases ]; then
+	while read alias rest; do
+	    if [ "$alias" = "$1" ]; then
+		echo "$rest"
+		return
+	    fi
+	done <aliases
+    fi
+    echo "$1"
+}
+
 findfile() {
-    local file tail eq eqt m matches max score
+    if [ -n "$debug" ]; then echo "finding base='$1', ep='$2', qual='$3'" >&2; fi
+    local base file tail eq eqt m matches max score
     matches=()
-    for file in "$1"*; do
-	tail="${file#$1}"
+    base="$(findbase "$1")"
+    for file in "$base"*; do
+	tail="${file#"$base"}"
 	eq="${tail%.*}"
 	m=n
 	if [ "${eq%% *}" -eq "$2" ] 2>/dev/null; then
@@ -36,7 +50,7 @@ findfile() {
 	    fi
 	fi
 	if [ "$m" = y ]; then
-	    if [ "$eqt" = "$3" -o "$eqt" = "($3)" ]; then
+	    if [ "$eqt" = "$3" -o "$eqt" = "($3)" -o "${eqt:0:2}" = "- " ]; then
 		matches=("${matches[@]}" "$file")
 	    fi
 	fi
@@ -45,35 +59,51 @@ findfile() {
     max=
     for m in "${matches[@]}"; do
 	score="$(scorefile "$m")"
+	if [ -n "$debug" ]; then echo "found \`$m': score $score" >&2; fi
 	if [ -z "$max" ] || [ "$score" -gt "$max" ]; then
 	    max="$score"
 	    file="$m"
 	fi
     done
+    if [ -n "$debug" ]; then echo "using \`$file'" >&2; fi
     echo "$file"
     return 0
 }
 
 origargs=("$0" "$@")
-cmdline=(mplayer -fs -ass)
-unset pretend
+cmdline=(mpv -fs)
+debug=
+log=y
+unset pretend printfile
 
 while [ "${1:0:1}" = - ]; do
     a="$1"
     shift
     case "$a" in
 	-h)
-	    echo "usage: planime [-htC] [-s PAR VAL] [NAME-QUAL] [EP|.] [TYPE-QUAL]" >&2
+	    echo "usage: planime [-fdhtCL] [-A PLAYER-ARGS... ;] [-s PAR VAL] [--] [NAME-QUAL] [EP|.] [TYPE-QUAL]" >&2
 	    exit 0
 	    ;;
+	-d)
+	    debug=y
+	    ;;
 	-t)
-	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
+	    cmdline=("${cmdline[@]}" -ao 'alsa:device=[hw:3,7]')
+	    DISPLAY=:1
+	    chwp=y
 	    ;;
 	-C)
 	    pretend=y
 	    ;;
+	-L)
+	    log=
+	    ;;
 	-A)
 	    while :; do
+		if [ $# -lt 1 ]; then
+		    echo "planime: unterminated argument list" >&2
+		    exit 1
+		fi
 		a="$1"
 		shift
 		if [ "$a" = \; ]; then
@@ -88,47 +118,47 @@ while [ "${1:0:1}" = - ]; do
 	    saveval="$1"
 	    shift
 	    ;;
+	-f)
+	    printfile=y
+	    ;;
+	-v)
+	    cmdline=("${cmdline[@]}" -v)
+	    ;;
+	--)
+	    break
+	    ;;
+	*)
+	    echo "planime: unknown option \`$a'"
+	    exit 1
+	    ;;
     esac
 done
 
-base="$(basename "$(pwd)")"
+dirbase="$(basename "$(pwd)")"
+base=.
 nextep=n
 file=
 tqual=
 if [ $# -eq 0 ]; then
     nextep=y
-    if [ -r curser ]; then
-	base="$base $(<curser)"
-    fi
 elif [ $# -eq 1 ]; then
     if [ -r "$1" ]; then
 	file="$1"
     else
-	if findfile "$base - " "$1" >/dev/null; then
-	    ep="$1"
-	else
-	    nextep=y
-	    base="$base $1"
-	fi
+	base=
+	ep="$1"
     fi
 elif [ $# -eq 2 ]; then
-    if findfile "$base - " "$1" "$2" >/dev/null; then
+    if findfile "$dirbase - " "$1" "$2" >/dev/null; then
+	base=""
 	ep="$1"
 	tqual="$2"
     else
-	if [ "$1" = . -a -r curser ]; then
-	    base="$base $(<curser)"
-	else
-	    base="$base $1"
-	fi
+	base="$1"
 	ep="$2"
     fi
 else
-    if [ "$1" = . -a -r curser ]; then
-	base="$base $(<curser)"
-    else
-	base="$base $1"
-    fi
+    base="$1"
     ep="$2"
     tqual="$3"
 fi
@@ -141,7 +171,21 @@ if [ "$nextep" = y -a -r nextep ]; then
     fi
 fi
 if [ -z "$file" ]; then
-    file="$(findfile "$base - " "$ep" "$tqual")"
+    if [ "$base" = . ]; then
+	if [ -r curser ]; then
+	    curser="$(<curser)"
+	else
+	    curser=
+	fi
+    else
+	curser="$(findbase "$base")"
+    fi
+    if [ -n "$curser" ]; then
+	file="$(findfile "$dirbase $curser - " "$ep" "$tqual")" || \
+	    file="$(findfile "$curser - " "$ep" "$tqual")"
+    else
+	file="$(findfile "$dirbase - " "$ep" "$tqual")"
+    fi
 fi
 
 if [ -z "$file" -o ! -r "$file" ]; then
@@ -204,20 +248,25 @@ fi
 if [ -n "$alang" ]; then
     cmdline=("${cmdline[@]}" -alang "$alang")
 elif [ -n "$aid" ]; then
-    cmdline=("${cmdline[@]}" -aid "$aid")
+    cmdline=("${cmdline[@]}" -aid "$((aid + 1))")
 fi
 if [ -n "$slang" ]; then
     cmdline=("${cmdline[@]}" -slang "$slang")
 elif [ -n "$sid" ]; then
-    cmdline=("${cmdline[@]}" -sid "$sid")
+    cmdline=("${cmdline[@]}" -sid "$((sid + 1))")
 fi
 
-if [ "`hostname`" = pc6 -o "`hostname`" = pc7 -a "$DISPLAY" = :1 ]; then chwp=y; fi
-
 if [ -n "$pretend" ]; then
     echo "${cmdline[@]}" "$file"
+elif [ -n "$printfile" ]; then
+    echo "$file"
 else
     if [ "$chwp" = y ]; then (sleep 2; randomwp) & fi
+    if [ "$log" = y ]; then
+	if [ -d $HOME/.anime ]; then
+	    echo "$(date) $(basename "$file")" >>$HOME/.anime/plog
+	fi
+    fi
     "${cmdline[@]}" "$file"
     
     if [ "$nextep" = y ]; then