X-Git-Url: http://dolda2000.com/gitweb/?p=utils.git;a=blobdiff_plain;f=autodlctl;h=8837b4786b5a2752b66b050aef87ef25659c5750;hp=dfe2698c7d027255137674a88bd57aa0ec0192fb;hb=32dd9fcf39b6f6fe560d3a8268b9cce2c8a9b116;hpb=34091d15cb6cd7e6dfe2bc33f17eaf589d28f6de

diff --git a/autodlctl b/autodlctl
index dfe2698..8837b47 100755
--- a/autodlctl
+++ b/autodlctl
@@ -11,12 +11,6 @@ function getnext
 	read curep <"$d/.autodl/badlist"
 	echo "downloading bad files, curep $curep"
 	epfrom=badlist
-	badsizesl="$(sed -n "s/^$curep \(.*\)$/\1/p" "$d/.autodl/badsizes")"
-	if [ -n "$badsizesl" ]; then
-	    read -a badsizes <<<"$badsizesl"
-	    unset badsizesl
-	    echo "found bad size list: ${badsizes[@]}"
-	fi
     elif [ -r "$d/.autodl/curep" ]; then
 	curep="`cat "$d/.autodl/curep"`"
 	echo "downloading series, curep $curep"
@@ -26,6 +20,15 @@ function getnext
 	echo "$tag" >>"$HOME/dc/autodl/faulty"
 	return 1
     fi
+    unset badsizesl
+    if [ -r "$d/.autodl/badsizes" ]; then
+	badsizesl="$(sed -n "s/^0*$curep \([^#]*\)\( *#.*\)\?$/\1/p" "$d/.autodl/badsizes")"
+    fi
+    if [ -n "$badsizesl" ]; then
+	read -a badsizes <<<"$badsizesl"
+	unset badsizesl
+	echo "found bad size list: ${badsizes[@]}"
+    fi
     unset args
     fsexpr="`printf "$sexpr" "$curep"`"
     if [ "${#badsizes[@]}" -gt 0 ]; then
@@ -34,7 +37,11 @@ function getnext
 	done
     fi
     infofile="$d/.autodl/rtinfo"
-    args=(-e "$fsexpr" -t "$tag $curep" -I "$infofile")
+    estatfile="$d/.autodl/estat"
+    args=(-e "$fsexpr" -t "$tag $curep" -I "$infofile" -E "$estatfile" -x "curep=$curep")
+    if [ -e "$d/.autodl/wait" ]; then
+	args=("${args[@]}" -w)
+    fi
     if [ -r "$d/.autodl/uarg" ]; then
 	uarg="`cat "$d/.autodl/uarg"`"
     elif [ -e "$d/.autodl/autouarg" ]; then
@@ -44,7 +51,7 @@ function getnext
 	fuarg="`printf "$uarg" "$curep"`"
 	args=("${args[@]}" -a "$fuarg")
     fi
-    outfile="`mktemp /tmp/autodlXXXXXX`"
+    outfile="$d/.autodl/output"
     echo "trying to download -- autodl ${args[@]}"
     intr=n
     autodl "${args[@]}" >"$outfile" 2>&1 &
@@ -52,14 +59,27 @@ function getnext
     trap "intr=y; kill -INT $pid" USR1 INT
     wait $pid
     stat=$?
+    if [ -r "$estatfile" ]; then
+	estat="`cat "$estatfile"`"
+	rm -f "$estatfile"
+    fi
     if [ "$intr" = y ]; then
 	echo "$tag interrupted"
     else
 	if [ "$stat" -ne 0 ]; then
-	    echo "Failure for $tag" >>"$HOME/dc/autodl/errorlog"
-	    tail -n 20 "$outfile" >>"$HOME/dc/autodl/errorlog"
+	    if [ "$stat" -eq 1 ]; then
+		echo "Failure for $tag" >>"$HOME/dc/autodl/errorlog"
+		tail -n 20 "$outfile" >>"$HOME/dc/autodl/errorlog"
+	    elif [ "$stat" -eq 2 ]; then
+		echo "Connection error on $tag"
+	    elif [ "$stat" -eq 3 ]; then
+		echo "Configuration error, disabling $tag"
+		cp "$outfile" "$d/.autodl/conferr"
+		touch "$d/.autodl/disabled"
+		echo "$tag" >>"$HOME/dc/autodl/faulty"
+	    fi
 	else
-	    echo "episode $curep of $tag done"
+	    echo "episode $curep of $tag done (estat: \"$estat\")"
 	    case "$epfrom" in
 		badlist)
 		    echo -en "${tag}\n${curep}\n" >>"$HOME/dc/autodl/baddone"
@@ -79,8 +99,14 @@ function getnext
 		    fi
 		    ;;
 		curep)
-		    echo -en "${tag}\n${curep}\n" >>"$HOME/dc/autodl/done"
-		    let curep++
+		    if [ "$estat" = dbl ]; then
+			echo -en "${tag}\n${curep}\n" >>"$HOME/dc/autodl/done"
+			echo -en "${tag}\n$((${curep} + 1))\n" >>"$HOME/dc/autodl/done"
+			let curep+=2
+		    else
+			echo -en "${tag}\n${curep}\n" >>"$HOME/dc/autodl/done"
+			let curep++
+		    fi
 		    echo "$curep" >"$d/.autodl/curep"
 		    if [ -r "$d/.autodl/maxep" ]; then
 			if [ "$curep" -gt "`cat "$d/.autodl/maxep"`" ]; then
@@ -93,7 +119,6 @@ function getnext
 	    esac
 	fi
     fi
-    rm -f "$infofile"
     rm -f "$outfile"
     rm -f "$HOME/dc/autodl/run/$tag"
 }
@@ -150,8 +175,10 @@ while [ "$done" != y ]; do
 		else
 		    tag="`basename "$d"`"
 		fi
+		start=y
 		if [ -e "$d/.autodl/disable" ]; then
 		    echo "disabling $tag per user request"
+		    start=n
 		    touch "$d/.autodl/disabled"
 		    rm -f "$d/.autodl/disable"
 		    if [ -r "$HOME/dc/autodl/run/$tag" ]; then
@@ -161,17 +188,35 @@ while [ "$done" != y ]; do
 		    else
 			echo "could not find pid for $tag"
 		    fi
-		elif [ ! -r "$d/.autodl/sexpr" ]; then
-		    touch "$d/.autodl/disabled"
-		    echo "$tag lacks sexpr" >&2
-		    echo "$tag" >>"$HOME/dc/autodl/faulty"
-		else
-		    if [ ! -e "$HOME/dc/autodl/run/$tag" ]; then
-			if [ $((`date +%s` - $lastget)) -gt 20 ]; then
-			    getnext "$d" "$tag" &
-			    lastget=`date +%s`
-			    pid=$!
-			    echo "$pid" >"$HOME/dc/autodl/run/$tag"
+		fi
+		if [ -e "$d/.autodl/restart" ]; then
+		    echo "restarting $tag per user request"
+		    rm -f "$d/.autodl/restart"
+		    if [ -r "$HOME/dc/autodl/run/$tag" ]; then
+			pid="`cat "$HOME/dc/autodl/run/$tag"`"
+			echo "sending SIGUSR1 to $pid"
+			kill -USR1 "$pid"
+			while [ -e "$HOME/dc/autodl/run/$tag" ]; do
+			    echo "waiting for it to exit"
+			    sleep 1
+			done
+		    else
+			echo "could not find pid for $tag"
+		    fi
+		fi
+		if [ $start = y ]; then
+		    if [ ! -r "$d/.autodl/sexpr" ]; then
+			touch "$d/.autodl/disabled"
+			echo "$tag lacks sexpr" >&2
+			echo "$tag" >>"$HOME/dc/autodl/faulty"
+		    else
+			if [ ! -e "$HOME/dc/autodl/run/$tag" ]; then
+			    if [ $((`date +%s` - $lastget)) -gt 20 ]; then
+				getnext "$d" "$tag" &
+				lastget=`date +%s`
+				pid=$!
+				echo "$pid" >"$HOME/dc/autodl/run/$tag"
+			    fi
 			fi
 		    fi
 		fi