X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=62c01a429b629f822cd4de37acbac58f4992d981;hb=535cc97f7ce80b29bbb5c183bb1079b44e011c6c;hp=32d79058f9e08940df2f51767c06006310163b8a;hpb=251d97caa7aeb7e855efa183798c65163506b1f0;p=utils.git

diff --git a/planime b/planime
index 32d7905..62c01a4 100755
--- a/planime
+++ b/planime
@@ -95,7 +95,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 +113,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 +148,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
@@ -152,14 +163,17 @@ if [ "$nextep" = y ]; then
 	1)
 	    cont=y
 	    ;;
-	2|$'\e')
+	2|"")
 	    save=y
 	    ;;
     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