Ground work for new statistics parser

Patch the statistics2 parser to make it pass the new study setting to get a baseline for the rewritten parser

Author: Jannled

.vscode/launch.json

@@ -57,7 +57,7 @@
 			}
 		},
 		{
-			"name": "Firefox & BurpProxy",
+			"name": "Firefox & Proxy",
 			"type": "firefox",
 			"request": "launch",
 			"reAttach": true,
@@ -66,19 +66,71 @@
 			"skipFiles": [
 				"static/src/externalLibraries/**"
 			],
-			"preferences": { // Burp Proxy
+			"preferences": { // Burp/mitmproxy etc.
 				"network.proxy.http": "127.0.0.1",
 				"network.proxy.http_port": 8080,
 				"network.proxy.type": 1,
 				"network.proxy.allow_hijacking_localhost": true
 			}
-		}
+		},
+		{
+			"name": "Statistics Generator",
+			"type": "debugpy",
+			"request": "launch",
+			"module": "app.statistics.statistics2",
+			"args": [
+				"${input:statsGroup}",
+				"--log",
+				"info",
+				"${input:skipScreenshots}",
+				"--allowDebug"
+			],
+			"env": {
+				"REVERSIM_INSTANCE": "${input:instancePath}"
+			},
+			"justMyCode": true,
+			"console": "integratedTerminal",
+		},
 	],
 	"inputs": [
 		{
 			"id": "screenshotGeneratorPseudonym",
 			"description": "The pseudonym to generate the screenshots with. Create it by starting the game in a group with the level viewer.",
 			"type": "promptString"
-		}
+		},
+		{
+			"id": "statsGroup",
+			"description": "The script to be used to generate the csv file. \"app/statistics/csvGenerators/\"",
+			"type": "promptString",
+			"default": "paper"
+		},
+		{
+			"id": "statsFolder",
+			"description": "Select the folder containing the log files",
+			"type": "promptString",
+			"default": "instance/statistics"
+		},
+		{
+			"id": "skipScreenshots",
+			"type": "pickString",
+			"description": "Set this flag if the validation of the screenshots shall be skipped",
+			"default": "--skipScreenshots",
+			"options": [
+				"",
+				"--skipScreenshots"
+			]
+		},
+		{
+			"id": "configFile",
+			"description": "Select the gameConfig.json that was used for this group",
+			"type": "promptString",
+			"default": "instance/conf/gameConfig.json"
+		},
+		{
+			"id": "instancePath",
+			"description": "Select the instance folder that was used to launch the game",
+			"type": "promptString",
+			"default": "instance"
+		},
 	]
 }

app/statistics/csvFile.py

@@ -245,7 +245,7 @@ def getLevelAttributes(
 			legend[groups].append(level.name)
 
 		# Make sure the level name matches the legend, because that information cannot be reconstructed in a later step
-		assert level.name == legend[groups][globalLevelIndex - 1], "Fatal, the level name does not match the legend!"
+		#assert level.name == legend[groups][globalLevelIndex - 1], "Fatal, the level name does not match the legend!"
 
 		# Create the column header belonging to this entry
 		outLevelHeader.extend([gLevelHeaderFormat % {

app/statistics/statistics2.py

@@ -477,6 +477,8 @@ def main():
 	global location_logs, location_pics, location_gameConfig, skip_pic_inspection
 	global timesync_threshold, header, groupFilter, attributes, vipLogs, timeline_events
 
+	INSTANCE_FOLDER = os.path.abspath(os.environ.get("REVERSIM_INSTANCE", "./instance"))
+
 	parser = argparse.ArgumentParser(description="A script to aggregate the logfiles from the ReverSim game into a csv file.")
 	parser.add_argument("csvGenerator", help="The script to be used to generate the csv file. \"app/statistics/csvGenerators/\"")
 	parser.add_argument("-l", "--log", metavar='LEVEL', help="Specify the log level, must be one of DEBUG, INFO, WARNING, ERROR or CRITICAL", default="INFO")
@@ -494,6 +496,7 @@ def main():
 			"Keep in mind that TimeSync events are only fired, if the client and server time deviate at least by "\
 			"config.py@TIME_DRIFT_THRESHOLD (0.2)", default=40 #s
 	)
+	#parser.add_argument('-i', '--instance-path', help='', default=INSTANCE_FOLDER)
 
 	args = parser.parse_args()
 	try:
@@ -531,8 +534,6 @@ def main():
 		logging.critical(str(e))
 		exit(-42)
 
-	INSTANCE_FOLDER = os.path.abspath(os.environ.get("REVERSIM_INSTANCE", "./instance"))
-
 	# Load the game config
 	gameConfig.loadGameConfig(
 		configName=os.environ.get("REVERSIM_CONFIG", "conf/gameConfig.json"),