X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=62c01a429b629f822cd4de37acbac58f4992d981;hb=535cc97f7ce80b29bbb5c183bb1079b44e011c6c;hp=731a467552457ca8d92547ceb63347728a71ab2b;hpb=529814da44d274cafe5cedf336102fd3649902e1;p=utils.git diff --git a/planime b/planime index 731a467..62c01a4 100755 --- a/planime +++ b/planime @@ -34,6 +34,7 @@ findfile() { return 1 } +origargs=("$0" "$@") cmdline=(mplayer -fs) while [ "${1:0:1}" = - ]; do @@ -94,58 +95,49 @@ 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 exit 1 fi -echo "$file" -exit 0 - -if [ ! -r "$ep" ]; then - if [ -z "$qual" ]; then - ep="$(basename "$(pwd)") - ${ep}" - else - ep="$(basename "$(pwd)") ${qual} - ${ep}" - fi - if [ -r "${ep}.ogm" ]; then - ep="${ep}.ogm" +case "${file##*.}" in + ogm) defopts=(-aid 1 -sid 0) - elif [ -r "${ep}.mkv" ]; then - ep="${ep}.mkv" + ;; + mkv) defopts=(-slang eng -alang jpn) - elif [ -r "${ep}.mpg" ]; then - ep="${ep}.mpg" - elif [ -r "${ep}.mp4" ]; then - ep="${ep}.mp4" - elif [ -r "${ep}.avi" ]; then - ep="${ep}.avi" - fi -fi - -if [ ! -r "$ep" ]; then - echo "no such episode: $ep" >&2 - exit 1 -fi + ;; +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 @@ -153,4 +145,35 @@ fi if [ "`hostname`" = pc6 ]; then chwp=y; fi if [ "$chwp" = y ]; then (sleep 2; randomwp) & fi -"${cmdline[@]}" "$ep" +"${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