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

diff --git a/planime b/planime
index b2b14dd..dfb8d64 100755
--- a/planime
+++ b/planime
@@ -4,8 +4,19 @@ isnum() {
     grep -xq '[0-9]\+' <<<"$1"
 }
 
+scorefile() {
+    if [ "${1##*.}" = mkv ]; then
+	echo 10
+    elif [ "${1##*.}" = ogm ]; then
+	echo 5
+    else
+	echo 0
+    fi
+}
+
 findfile() {
-    local file tail eq eqt m
+    local file tail eq eqt m matches max score
+    matches=()
     for file in "$1"*; do
 	tail="${file#$1}"
 	eq="${tail%.*}"
@@ -26,28 +37,41 @@ findfile() {
 	fi
 	if [ "$m" = y ]; then
 	    if [ "$eqt" = "$3" -o "$eqt" = "($3)" ]; then
-		echo "$file"
-		return 0
+		matches=("${matches[@]}" "$file")
 	    fi
 	fi
     done
-    return 1
+    if [ ${#matches[@]} -lt 1 ]; then return 1; fi
+    max=
+    for m in "${matches[@]}"; do
+	score="$(scorefile "$m")"
+	if [ -z "$max" ] || [ "$score" -gt "$max" ]; then
+	    max="$score"
+	    file="$m"
+	fi
+    done
+    echo "$file"
+    return 0
 }
 
 origargs=("$0" "$@")
 cmdline=(mplayer -fs -ass)
+unset pretend
 
 while [ "${1:0:1}" = - ]; do
     a="$1"
     shift
     case "$a" in
 	-h)
-	    echo "usage: planime [-ht] [-s PAR VAL] [NAME-QUAL] [EP|.] [TYPE-QUAL]" >&2
+	    echo "usage: planime [-htC] [-s PAR VAL] [NAME-QUAL] [EP|.] [TYPE-QUAL]" >&2
 	    exit 0
 	    ;;
 	-t)
 	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
 	    ;;
+	-C)
+	    pretend=y
+	    ;;
 	-A)
 	    while :; do
 		a="$1"
@@ -157,6 +181,8 @@ if [ -r "$ifile" ]; then
 	    cmdline=("${cmdline[@]}" -delay "$arg")
 	elif [ "$par" = aspect ]; then
 	    cmdline=("${cmdline[@]}" -aspect "$arg")
+	elif [ "$par" = volmod ]; then
+	    cmdline=("${cmdline[@]}" -af volume="$arg")
 	elif [ "$par" = alang ]; then
 	    unset alang aid
 	    alang="$arg"
@@ -186,38 +212,42 @@ elif [ -n "$sid" ]; then
     cmdline=("${cmdline[@]}" -sid "$sid")
 fi
 
-if [ "`hostname`" = pc6 ]; then chwp=y; fi
+if [ "`hostname`" = pc6 -o "`hostname`" = pc7 -a "$DISPLAY" = :1 ]; then chwp=y; fi
 
-if [ "$chwp" = y ]; then (sleep 2; randomwp) & fi
-"${cmdline[@]}" "$file"
-
-if [ "$nextep" = y ]; then
-    echo "0. Save and continue (or Space)"
-    echo "1. Continue without saving"
-    echo "2. Save and exit (or Enter)"
-    echo "3. Exit without saving (or any key)"
-    IFS= read -sn1 c
-    save=n
-    cont=n
-    case "$c" in
-	0|" ")
-	    save=y
-	    cont=y
-	    ;;
-	1)
-	    cont=y
-	    ;;
-	2|"")
-	    save=y
-	    ;;
-    esac
-    if [ "$save" = y ]; then
-	let ep++
-	echo "$ep" >nextep
-    fi
-    if [ "$cont" = y ]; then
-	exec "${origargs[@]}"
-    else
-	echo "nextep is $ep"
+if [ -n "$pretend" ]; then
+    echo "${cmdline[@]}" "$file"
+else
+    if [ "$chwp" = y ]; then (sleep 2; randomwp) & fi
+    "${cmdline[@]}" "$file"
+    
+    if [ "$nextep" = y ]; then
+	echo "0. Save and continue (or Space)"
+	echo "1. Continue without saving"
+	echo "2. Save and exit (or Enter)"
+	echo "3. Exit without saving (or any key)"
+	IFS= read -sn1 c
+	save=n
+	cont=n
+	case "$c" in
+	    0|" ")
+		save=y
+		cont=y
+		;;
+	    1)
+		cont=y
+		;;
+	    2|"")
+		save=y
+		;;
+	esac
+	if [ "$save" = y ]; then
+	    let ep++
+	    echo "$ep" >nextep
+	fi
+	if [ "$cont" = y ]; then
+	    exec "${origargs[@]}"
+	else
+	    echo "nextep is $ep"
+	fi
     fi
 fi