X-Git-Url: http://dolda2000.com/gitweb/?p=utils.git;a=blobdiff_plain;f=planime;h=ed79ec9c29a7f52742624d1d86c4c283f508ec6f;hp=b23a2d9707201b8e99c99ee3358944a92e4af914;hb=83d0edbb4ed4641ad1b7452a53aa6a66f8d55a83;hpb=2d68de164d5d5138aa77f47176dca629efe90a6e

diff --git a/planime b/planime
index b23a2d9..ed79ec9 100755
--- a/planime
+++ b/planime
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 isnum() {
     grep -xq '[0-9]\+' <<<"$1"
@@ -35,7 +35,7 @@ findfile() {
 }
 
 origargs=("$0" "$@")
-cmdline=(mplayer -fs)
+cmdline=(mplayer -fs -ass)
 
 while [ "${1:0:1}" = - ]; do
     a="$1"
@@ -48,6 +48,16 @@ while [ "${1:0:1}" = - ]; do
 	-t)
 	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
 	    ;;
+	-A)
+	    while :; do
+		a="$1"
+		shift
+		if [ "$a" = \; ]; then
+		    break;
+		fi
+		cmdline=("${cmdline[@]}" "$a")
+	    done
+	    ;;
 	-s)
 	    savepar="$1"
 	    shift
@@ -63,6 +73,9 @@ 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"
@@ -79,11 +92,19 @@ elif [ $# -eq 2 ]; then
 	ep="$1"
 	tqual="$2"
     else
-	base="$base $1"
+	if [ "$1" = . -a -r curser ]; then
+	    base="$base $(<curser)"
+	else
+	    base="$base $1"
+	fi
 	ep="$2"
     fi
 else
-    base="$base $1"
+    if [ "$1" = . -a -r curser ]; then
+	base="$base $(<curser)"
+    else
+	base="$base $1"
+    fi
     ep="$2"
     tqual="$3"
 fi
@@ -95,7 +116,9 @@ if [ "$nextep" = y -a -r nextep ]; then
 	exit 1
     fi
 fi
-file="$(findfile "$base - " "$ep" "$qual")"
+if [ -z "$file" ]; then
+    file="$(findfile "$base - " "$ep" "$tqual")"
+fi
 
 if [ -z "$file" -o ! -r "$file" ]; then
     echo "planime: no matching file found" >&2
@@ -111,22 +134,31 @@ case "${file##*.}" in
 	;;
 esac
 
-ifile=".${ep}.info"
+ifile=".${file}.info"
 
 if [ -n "$savepar" ]; then
     if [ -r "$ifile" ]; then
-	egrep -v "^${savepar}:" "$ifile" >"$ifile.new"
+	egrep -v "^${savepar} " "$ifile" >"$ifile.new"
 	mv -f "$ifile.new" "$ifile"
     fi
-    echo "$savepar: $saveval" >>"$ifile"
+    echo "$savepar $saveval" >>"$ifile"
     exit 0
 fi
 
 unset delay
 
 if [ -r "$ifile" ]; then
-    delay="$(sed -n 's/delay *: *\([^ ]*\)$/\1/p' <"$ifile")"
-    cmdline=("${cmdline[@]}" -delay "$delay")
+    exec 3<&0
+    exec 0<"$ifile"
+    while read par arg; do
+	if [ "$par" = delay ]; then
+	    cmdline=("${cmdline[@]}" -delay "$arg")
+	elif [ "$par" = aspect ]; then
+	    cmdline=("${cmdline[@]}" -aspect "$arg")
+	fi
+    done
+    exec 0<&3
+    exec 3<&-
 else
     cmdline=("${cmdline[@]}" "${defopts[@]}")
 fi
@@ -137,10 +169,10 @@ if [ "$chwp" = y ]; then (sleep 2; randomwp) & fi
 "${cmdline[@]}" "$file"
 
 if [ "$nextep" = y ]; then
-    echo "0. Save and continue"
+    echo "0. Save and continue (or Space)"
     echo "1. Continue without saving"
-    echo "2. Save and exit"
-    echo "3. Exit 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
@@ -157,9 +189,12 @@ if [ "$nextep" = y ]; then
 	    ;;
     esac
     if [ "$save" = y ]; then
-	echo "$(($ep + 1))" >nextep
+	let ep++
+	echo "$ep" >nextep
     fi
     if [ "$cont" = y ]; then
 	exec "${origargs[@]}"
+    else
+	echo "nextep is $ep"
     fi
 fi