diff -Nru vdr-addon-naludump-0.0.1/debian/changelog vdr-addon-naludump-0.0.1/debian/changelog --- vdr-addon-naludump-0.0.1/debian/changelog 2011-01-06 21:29:35.000000000 +0000 +++ vdr-addon-naludump-0.0.1/debian/changelog 2011-01-15 19:32:30.000000000 +0000 @@ -1,3 +1,9 @@ +vdr-addon-naludump (0.0.1-0yavdr4) lucid; urgency=low + + * try to fix endless loop, try to make more errorproof, add ionice -c 3 + + -- Holger Schvestka Thu, 13 Jan 2011 00:02:35 +0100 + vdr-addon-naludump (0.0.1-0yavdr2) lucid; urgency=low * Initial release diff -Nru vdr-addon-naludump-0.0.1/debian/install vdr-addon-naludump-0.0.1/debian/install --- vdr-addon-naludump-0.0.1/debian/install 2011-01-04 19:04:34.000000000 +0000 +++ vdr-addon-naludump-0.0.1/debian/install 2011-01-12 22:55:21.000000000 +0000 @@ -1,4 +1,3 @@ naludump usr/bin debian/S50.naludump usr/share/vdr/shutdown-hooks debian/R10.naludump etc/vdr/recording-hooks -debian/vdr_naludump usr/bin/ diff -Nru vdr-addon-naludump-0.0.1/debian/R10.naludump vdr-addon-naludump-0.0.1/debian/R10.naludump --- vdr-addon-naludump-0.0.1/debian/R10.naludump 2011-01-06 21:29:01.000000000 +0000 +++ vdr-addon-naludump-0.0.1/debian/R10.naludump 2011-01-15 19:21:56.000000000 +0000 @@ -1,7 +1,28 @@ # naludump recording hook script if [ "$1" = "after" ]; then -if grep -q "^X 5 0B*" "$2/info" ; then -/usr/bin/vdr_naludump $2 - fi + if grep -q "^X 5 0B*" "$2/info" ; then + MAINDIR="$2" + for tsfile in $2/?????.ts; do + if [ -L "$tsfile" ]; then + tsfile=$(readlink $tsfile) + fi + DIR=$(dirname $tsfile) + FILE=$(basename $tsfile) + + mv "$DIR/$FILE" "$DIR/_$FILE" + ionice -c 3 naludump "$DIR/_$FILE" "$DIR/$FILE" >> $MAINDIR/naludump.log 2>&1 + if [ "$?" = "0" ]; then + if [ -e "$DIR/$FILE" ]; then + rm "$DIR/_$FILE" + fi + else + mv "$DIR/_$FILE" "$DIR/$FILE" + echo "##########naludump finished unsuccessfull." >> $MAINDIR/naludump.log + fi + done + ionice -c 3 vdr --genindex="$2" >> "$2"/naludump.log 2>&1 + svdrpsend MESG \"Finished stripping NALUs from recording "$(basename $MAINDIR)"\" + + fi fi diff -Nru vdr-addon-naludump-0.0.1/debian/vdr_naludump vdr-addon-naludump-0.0.1/debian/vdr_naludump --- vdr-addon-naludump-0.0.1/debian/vdr_naludump 2011-01-04 19:03:47.000000000 +0000 +++ vdr-addon-naludump-0.0.1/debian/vdr_naludump 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/bash - -cd $1 -for tsfile in *.ts; do - mv ${tsfile} _${tsfile} - naludump _${tsfile} ${tsfile} >> naludump.log 2>&1 - rm _${tsfile} -done -vdr --genindex=$1 >> naludump.log 2>&1 -svdrpsend MESG \"Finished stripping NALUs from recording '$1'\" -