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

diff --git a/autodlctl b/autodlctl
index 8837b47..134fb8d 100755
--- a/autodlctl
+++ b/autodlctl
@@ -2,30 +2,49 @@
 
 paths=(/home/pub/video/anime $HOME/dc/autodl/cur)
 
+function findcurep
+{
+    if [ -r badlist ]; then
+	echo badlist `head -n 1 badlist`
+	return 0
+    fi
+    if [ -r curep ]; then
+	if [ -r maxep ]; then
+	    if [ "`cat curep`" -le "`cat maxep`" ]; then
+		echo curep `cat curep`
+		return 0
+	    fi
+	else
+	    echo curep `cat curep`
+	    return 0
+	fi
+    fi
+    echo none
+    return 1
+}
+
 function getnext
 {
+    cd "$1/.autodl/"
+    tag="$2"
     echo "checking $tag"
-    sexpr="`cat "$d/.autodl/sexpr"`"
+    sexpr="`cat sexpr`"
     unset badsizes
-    if [ -r "$d/.autodl/badlist" ]; then
-	read curep <"$d/.autodl/badlist"
-	echo "downloading bad files, curep $curep"
-	epfrom=badlist
-    elif [ -r "$d/.autodl/curep" ]; then
-	curep="`cat "$d/.autodl/curep"`"
-	echo "downloading series, curep $curep"
-	epfrom=curep
-    else
+    epinfo=(`findcurep`)
+    if [ "${epinfo[0]}" = none ]; then
 	echo "no available episode of $tag" >&2
 	echo "$tag" >>"$HOME/dc/autodl/faulty"
+	touch disabled
 	return 1
     fi
+    epfrom="${epinfo[0]}"
+    curep="${epinfo[1]}"
     unset badsizesl
-    if [ -r "$d/.autodl/badsizes" ]; then
-	badsizesl="$(sed -n "s/^0*$curep \([^#]*\)\( *#.*\)\?$/\1/p" "$d/.autodl/badsizes")"
+    if [ -r badsizes ]; then
+	badsizesl="$(sed -n "s/^0*$curep \([^#]*\)\( *#.*\)\?$/\1/p" badsizes)"
     fi
     if [ -n "$badsizesl" ]; then
-	read -a badsizes <<<"$badsizesl"
+	read -d/ -a badsizes <<<"$badsizesl"
 	unset badsizesl
 	echo "found bad size list: ${badsizes[@]}"
     fi
@@ -36,22 +55,22 @@ function getnext
 	    fsexpr="$fsexpr & ! S=$badsize"
 	done
     fi
-    infofile="$d/.autodl/rtinfo"
-    estatfile="$d/.autodl/estat"
+    infofile=rtinfo
+    estatfile=estat
     args=(-e "$fsexpr" -t "$tag $curep" -I "$infofile" -E "$estatfile" -x "curep=$curep")
-    if [ -e "$d/.autodl/wait" ]; then
+    if [ -e wait ]; then
 	args=("${args[@]}" -w)
     fi
-    if [ -r "$d/.autodl/uarg" ]; then
-	uarg="`cat "$d/.autodl/uarg"`"
-    elif [ -e "$d/.autodl/autouarg" ]; then
-	uarg="rename:$tag - %02i.avi:move:../autodl/cur/$tag"
+    if [ -r uarg ]; then
+	uarg="`cat uarg`"
+    elif [ -e autouarg ]; then
+	uarg="rename:$tag - %02i.ext:move:../autodl/cur/$tag"
     fi
     if [ -n "$uarg" ]; then
 	fuarg="`printf "$uarg" "$curep"`"
 	args=("${args[@]}" -a "$fuarg")
     fi
-    outfile="$d/.autodl/output"
+    outfile=output
     echo "trying to download -- autodl ${args[@]}"
     intr=n
     autodl "${args[@]}" >"$outfile" 2>&1 &
@@ -60,7 +79,7 @@ function getnext
     wait $pid
     stat=$?
     if [ -r "$estatfile" ]; then
-	estat="`cat "$estatfile"`"
+	estat=(`cat "$estatfile"`)
 	rm -f "$estatfile"
     fi
     if [ "$intr" = y ]; then
@@ -74,8 +93,8 @@ function getnext
 		echo "Connection error on $tag"
 	    elif [ "$stat" -eq 3 ]; then
 		echo "Configuration error, disabling $tag"
-		cp "$outfile" "$d/.autodl/conferr"
-		touch "$d/.autodl/disabled"
+		cp "$outfile" conferr
+		touch disabled
 		echo "$tag" >>"$HOME/dc/autodl/faulty"
 	    fi
 	else
@@ -83,17 +102,10 @@ function getnext
 	    case "$epfrom" in
 		badlist)
 		    echo -en "${tag}\n${curep}\n" >>"$HOME/dc/autodl/baddone"
-		    egrep -v "^$curep( |\$)" "$d/.autodl/badlist" >"$d/.autodl/newbadlist"
-		    mv -f "$d/.autodl/newbadlist" "$d/.autodl/badlist"
-		    if [ `wc -l <"$d/.autodl/badlist"` -eq 0 ]; then
-			rm "$d/.autodl/badlist"
-			if [ -r "$d/.autodl/curep" ]; then
-			    if [ -r "$d/.autodl/maxep" ] && [ "`cat "$d/.autodl/curep"`" -gt "`cat "$d/.autodl/maxep"`" ]; then
-				touch "$d/.autodl/disabled"
-			    fi
-			else
-			    touch "$d/.autodl/disabled"
-			fi
+		    egrep -v "^$curep( |\$)" badlist >newbadlist
+		    mv -f newbadlist badlist
+		    if [ `wc -l <badlist` -eq 0 ]; then
+			rm badlist
 			echo "$tag has no more bad episodes"
 			echo "$tag" >>"$HOME/dc/autodl/badmaxed"
 		    fi
@@ -102,21 +114,32 @@ function getnext
 		    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
+			let "nextep=curep+2"
 		    else
 			echo -en "${tag}\n${curep}\n" >>"$HOME/dc/autodl/done"
-			let curep++
+			let "nextep=curep+1"
 		    fi
-		    echo "$curep" >"$d/.autodl/curep"
-		    if [ -r "$d/.autodl/maxep" ]; then
-			if [ "$curep" -gt "`cat "$d/.autodl/maxep"`" ]; then
-			    touch "$d/.autodl/disabled"
+		    echo "$nextep" >curep
+		    if [ -r maxep ]; then
+			if [ "$nextep" -gt "`cat maxep`" ]; then
 			    echo "$tag has reached max"
 			    echo "$tag" >>"$HOME/dc/autodl/maxed"
 			fi
 		    fi
 		    ;;
 	    esac
+	    if [ "$estat" = bad ]; then
+		echo "episode reported as bad, adding to badlist"
+		echo "$curep" >>badlist
+	    elif [ "${estat[0]}" = badsize ]; then
+		echo "size reported as bad"
+		echo "$curep" >>badlist
+		echo "$curep ${estat[1]}" >>badsizes
+	    fi
+	    if ! findcurep; then
+		echo "no more episodes to download from $tag"
+		touch disabled
+	    fi
 	fi
     fi
     rm -f "$outfile"