X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=f8f3455206619a2b1c5ac3a5ca8b95154bd9e9dd;hb=4331b691c0e4073402529c9de16fe57d38e3edfb;hp=bbcedec0ddbc6a2db0fb9056a28b3a75d488ce6f;hpb=08f0ef07ea5d58525ac59ad405598e88713f955c;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index bbcedec0..f8f34552 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -164,7 +164,8 @@ buildthemap()
 	blobhash=$4
 	commithash=$5
 	if lwp-request -m HEAD "$url$M-$blobhash.pk3"; then
-		continue
+		# already compiled
+		return
 	fi
 
 	git reset --hard
@@ -237,13 +238,19 @@ screenshotthemap()
 	M=$3
 	blobhash=$4
 	commithash=$5
+	if ! [ -f "$bspdir/$M-$blobhash.pk3" ]; then
+		# not downloaded yet
+		return
+	fi
+
 	if lwp-request -m HEAD "$url$M-$blobhash/$M-000000.jpg"; then
-		continue
+		# already done
+		return
 	fi
 
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp"; then
 		# no BSP file
-		continue
+		return
 	fi
 
 	rm -rf ~/.xonotic/data
@@ -304,14 +311,12 @@ getthemap()
 		if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
 			rm -f "$bspdir/$M-$blobhash.pk3"
 			echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet"
-			getthemap_fail=true
 			return 0
 		fi
 	fi
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then
 		rm -f "$bspdir/$M-$blobhash.pk3"
 		echo "WARNING: could not download $url$M-$blobhash.pk3, invalid zip file"
-		getthemap_fail=true
 		return 0
 	fi
 }
@@ -376,13 +381,17 @@ case "$1" in
 			git clean -xfd
 			git checkout -f "$HASH"
 
+			getthemap_fail=false
 			rundownload
+
+			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
+
 			if $getthemap_fail; then
+				# If any map fetch failed, we've skipped them and thus need to try again later.
+				# Note that we're not going to re-screenshot maps because of this as we'll check for uploaded screenshots first.
 				continue
 			fi
 
-			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
-
 			touch "$screenshot_cachedir/$HASH"
 		done
 		git checkout -f master