X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=6ab0737cf9d5494a1575c7f5bed6dd7e9a044989;hb=b88a238b70f1f33415aff8fcf6fefb633b0c6a5d;hp=41332ae3c369b71a37dae46b3c6a033ee27bf81f;hpb=4c7a7e7043150ed7b1d49ceba84f9d67785d4185;p=utils.git

diff --git a/planime b/planime
index 41332ae..6ab0737 100755
--- a/planime
+++ b/planime
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 isnum() {
     grep -xq '[0-9]\+' <<<"$1"
@@ -34,6 +34,7 @@ findfile() {
     return 1
 }
 
+origargs=("$0" "$@")
 cmdline=(mplayer -fs)
 
 while [ "${1:0:1}" = - ]; do
@@ -62,6 +63,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"
@@ -78,11 +82,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
@@ -94,7 +106,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
@@ -110,22 +124,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
@@ -134,3 +157,34 @@ if [ "`hostname`" = pc6 ]; 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"
+    fi
+fi