X-Git-Url: http://dolda2000.com/gitweb/?p=utils.git;a=blobdiff_plain;f=planime;h=51646b7bafda975bf701cedff6d5b47133393cca;hp=3dab1dd4c5d4c588bb5e106f9178a691280b4872;hb=2236570527575f095d9ca8862acecccbea65ca14;hpb=dc508f57af7005ba808ef5ab560b33c4d886ae6e

diff --git a/planime b/planime
index 3dab1dd..51646b7 100755
--- a/planime
+++ b/planime
@@ -14,12 +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() {
     if [ -n "$debug" ]; then echo "finding base='$1', ep='$2', qual='$3'" >&2; fi
-    local file tail eq eqt m matches max score
+    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
@@ -74,13 +87,19 @@ while [ "${1:0:1}" = - ]; do
 	    debug=y
 	    ;;
 	-t)
-	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
+	    cmdline=("${cmdline[@]}" -ao alsa:device=hw=3.7)
+	    DISPLAY=:1
+	    chwp=y
 	    ;;
 	-C)
 	    pretend=y
 	    ;;
 	-A)
 	    while :; do
+		if [ $# -lt 1 ]; then
+		    echo "planime: unterminated argument list" >&2
+		    exit 1
+		fi
 		a="$1"
 		shift
 		if [ "$a" = \; ]; then
@@ -108,44 +127,31 @@ while [ "${1:0:1}" = - ]; do
     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
@@ -158,7 +164,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
@@ -229,8 +249,6 @@ elif [ -n "$sid" ]; then
     cmdline=("${cmdline[@]}" -sid "$sid")
 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