New buildscript in python, without resuming yet...

Signed-off-by: merspieler <merspieler@airmail.cc>

build

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/python3
 # Copyright (C) 2018 Merspieler, merspieler _at_ airmail.cc
 #
 # This program is free software; you can redistribute it and/or
@@ -15,88 +15,105 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-first=1
+import sys
-while [[ $# -gt 0 ]]
+import os
-do
+import re
-key="$1"
+from math import ceil
+import time
 
-case $key in
+argc = len(sys.argv)
-	-t|--threads)
+i = 1
-		man_thread="$2"
+first = 1
-		shift # past argument
+create_zip = False
-		shift # past value
+man_threads = ""
-	;;
+project = ""
+while i < argc:
+	if sys.argv[i] == "-t" or sys.argv[i] == "--threads":
+		i += 1
+		man_threads = "-t sys.argv[i]"
+	elif sys.argv[i] == "-z" or sys.argv[i] == "--zip":
+		create_zip = True
+	elif sys.argv[i] == "-h" or sys.argv[i] == "--help":
+		print("usage: build <project> [OPTIONS]")
+		print("Builds the tiles with osm2city")
+		print("")
+		print("OPTIONS")
+		print("  -h, --help      Shows this help and exit")
+		print("  -t, --threads   Number of threads used for building")
+		print("                  This will overwrite the value from the general-settings file")
+		print("  -z, --zip       Create a ready to distribute zip file on success")
+		sys.exit(0)
+	else:
+		if first == 1:
+			first = 0
+			project = sys.argv[i]
+		else:
+			print("Unknown option " + sys.argv[i])
+			sys.exit(1)
+	i += 1
 
-	-z|--zip)
+if project == "":
-		create_zip=1
+	print("No project was given. See build -h for details")
-		shift # past argument
+	sys.exit(1)
-	;;
 
-	-h|--help)
+try:
-		echo "usage: build <project> [OPTIONS]"
+	settings_file = open("projects/" + project + "/settings")
-		echo "Builds the tiles with osm2city"
+	bounds = settings_file.readline()
-		echo ""
+	settings_file.close()
-		echo "OPTIONS"
+except:
-		echo "  -h, --help      Shows this help and exit"
+	print("Couldn't find the settings file for the given project.")
-		echo "  -t, --threads   Number of threads used for building"
+	print("Please check if the project exsists and contains the 'settings' file.")
-		echo "                  This will overwrite the value from the general-settings file"
+	print("To create a new project run './create-project'")
-		echo "  -z, --zip	Create a ready to distribute zip file on success"
+	sys.exit(1)
-		exit 0
-	;;
 
-	*)
+match = re.match("^bounds=\*?(-?[0-9]{1,3})_(-?[0-9]{1,2})_(-?[0-9]{1,3})_(-?[0-9]{1,2})$", bounds)
-		if [ $first == "1" ]; then
+if match:
-			project="$key"
+	west = match.group(1)
-			shift #past project
+	south = match.group(2)
-			first=0
+	east = match.group(3)
-		else
+	north = match.group(4)
-			echo "Unknown option $key"
+else:
-			exit 1
+	print("Failed to get bounds")
-		fi
+	sys.exit(1)
-	;;
-esac
-done
 
-if [ -z "$project" ]; then
+width = ceil(east - west)
-	echo "No project was given. See build -h for details"
+height = ceil(north - south)
-	exit 1
+start_time = time.time()
-fi
 
-if [ ! -f "projects/$project/params.ini" ]; then
+for w in range(0, width):
-	echo "Project does not exsist. Please run ./create-project to create one"
+	build_w = west + w
-	exit 1
+	build_e = build_w + 1
-fi
+	if build_e > east:
+		build_e = east
+
+	if build_w < 0:
+		build_w = "*" + str(build_w)
+
+	for s in range(0, height):
+		build_s = south + s
+		build_n = build_s + 1
+		if build_n > north:
+			build_n = north
+
+		os.system("./build_tile " + project + " " + man_threads + " -b " + str(build_w) + "_" + str(build_s) + "_" + str(build_e) + "_" + str(build_n))
+
+# Get build time
+end_time = time.time()
+elapsed = end_time - start_time
+seconds = elapsed % 60
+elapsed = (elapsed - seconds) / 60
+minutes = elapsed % 60
+elapsed = (elapsed - minutes) / 60
+hours = elapsed % 24
+days = (elapsed - hours) / 24
+
+time = str(hours) + " Hours, " + str(minutes) + " Minutes and " + str(seconds) + " Seconds"
+if days > 0:
+	time = str(days) + " Days, " + time
+
+print("Building " + project + "took " + time)
 
 
-source venv/bin/activate > /dev/null 2>&1
+if create_zip:
-if [ $? == 1 ]; then
+	print("Creating zip file...")
-	echo "Couldn't find the venv. Please run './create-venv' to create one"
+	os.system("zip -rq projects/" + project + "/" + project + ".zip projects/" + project + "/scenery/")
-	exit 1
-fi
-source projects/$project/settings > /dev/null 2>&1
-if [ $? == 1 ]; then
-	echo "Couldn't find the settings file for the given project."
-	echo "Please check if the project exsists and contains the 'settings' file."
-	echo "To create a new project run './create-project'"
-	exit 1
-fi
-source general-settings > /dev/null 2>&1
-if [ $? == 1 ]; then
-	echo "Couldn't find the general settings. Please run ./install first."
-fi
-
-if [ ! -z "$man_thread" ]; then
-	threads=$man_thread
-fi
-
-# change to the project dir and build
-cd projects/$project
-rm -f osm2city-exceptions.log
-time ( python3 ../../osm2city/build_tiles.py -f params.ini -b "$bounds" -p "$threads" 2>&1 ) 2> exec-time
-
-if [ -z "$create_zip" ]; then
-	echo "Creating zip file..."
-	zip -rq $project.zip scenery/
-fi
-
-cat exec-time | grep "real" | sed "s/real\t\([0-9]*\)m\([0-9]*\).*/Building $project took \1 minutes and \2 seconds./"