X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=0cfb057922ff7401190bd2392bf36e4259c935e6;hb=095d08470736f427b7c995d20a6a411f4e527f84;hp=75306ced9d64f892e713e5ae4f3bbad13bd3f2d0;hpb=5c9ec588256c0925000599ae5f7664577bef49a3;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 75306ced..0cfb0579 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -3,7 +3,7 @@
 set -e
 
 bspdir="$PWD/data"
-url_http=http://beta.xonotic.org/autobuild-bsp/
+url_http=https://beta.xonotic.org/autobuild-bsp/
 url_ssh=xonotic-beta:autobuild-bsp/
 build_cachedir="$HOME/xonotic-map-compiler.cache/"
 screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
@@ -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
@@ -301,17 +308,15 @@ getthemap()
 		fi
 	fi
 	if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
-		if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
+		if ! curl -Lo "$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
 }
@@ -378,12 +383,15 @@ case "$1" in
 
 			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