X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=9c174592b37bc6cc62aab44c2d81e049489dc4b1;hb=d54814233c3658b6f5138dc16c91ac2ee5da55ad;hp=5a0f3023bb8ad26786ea80f1ce1e4e4f93439db1;hpb=4f06ae97a651bd02aceb2cd0ab7adc6147c83805;p=utils.git

diff --git a/planime b/planime
index 5a0f302..9c17459 100755
--- a/planime
+++ b/planime
@@ -15,6 +15,7 @@ scorefile() {
 }
 
 findfile() {
+    if [ -n "$debug" ]; then echo "finding base='$1', ep='$2', qual='$3'" >&2; fi
     local file tail eq eqt m matches max score
     matches=()
     for file in "$1"*; do
@@ -45,17 +46,20 @@ 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)
+debug=
 unset pretend printfile
 
 while [ "${1:0:1}" = - ]; do
@@ -63,9 +67,12 @@ while [ "${1:0:1}" = - ]; do
     shift
     case "$a" in
 	-h)
-	    echo "usage: planime [-htCf] [-A PLAYER-ARGS... ;] [-s PAR VAL] [NAME-QUAL] [EP|.] [TYPE-QUAL]" >&2
+	    echo "usage: planime [-fdhtC] [-A PLAYER-ARGS... ;] [-s PAR VAL] [--] [NAME-QUAL] [EP|.] [TYPE-QUAL]" >&2
 	    exit 0
 	    ;;
+	-d)
+	    debug=y
+	    ;;
 	-t)
 	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
 	    ;;
@@ -91,47 +98,41 @@ while [ "${1:0:1}" = - ]; do
 	-f)
 	    printfile=y
 	    ;;
+	--)
+	    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
@@ -144,7 +145,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="$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