Improve FriendlyPlayerExporter and pin with tests

Detect the friendly player in AI games and Battlegrounds by looking at
the non-AI player. This should be more consistent.

Author: beheh

hslog/export.py

@@ -194,15 +194,29 @@ def __init__(self, packet_tree):
 		super().__init__(packet_tree)
 		self._controller_map = {}
 		self.friendly_player = None
+		self._ai_player = None
+		self._non_ai_players = []
 
 	def export(self):
 		for packet in self.packet_tree:
 			self.export_packet(packet)
-			if self.friendly_player:
+			if self.friendly_player is not None:
 				# Stop export once we have it
 				break
 		return self.friendly_player
 
+	def handle_create_game(self, packet):
+		for player in packet.players:
+			self.export_packet(player)
+		if self._ai_player is not None and len(self._non_ai_players) == 1:
+			self.friendly_player = self._non_ai_players[0]
+
+	def handle_player(self, packet):
+		if packet.lo == 0:
+			self._ai_player = packet.player_id
+		else:
+			self._non_ai_players.append(packet.player_id)
+
 	def handle_tag_change(self, packet):
 		if packet.tag == GameTag.CONTROLLER:
 			self._controller_map[packet.entity] = packet.value

tests/test_export.py

@@ -0,0 +1,35 @@
+from hslog.export import FriendlyPlayerExporter
+
+from .conftest import logfile
+
+
+class TestFriendlyPlayerExporter():
+	def test_inferrable(self, parser):
+		with open(logfile("friendly_player_id_is_1.power.log")) as f:
+			parser.read(f)
+
+		assert len(parser.games) == 1
+		packet_tree = parser.games[0]
+		fpe = FriendlyPlayerExporter(packet_tree)
+		friendly_player = fpe.export()
+		assert friendly_player == 1
+
+	def test_ai_game(self, parser):
+		with open(logfile("puzzlelab.power.log")) as f:
+			parser.read(f)
+
+		assert len(parser.games) == 1
+		packet_tree = parser.games[0]
+		fpe = FriendlyPlayerExporter(packet_tree)
+		friendly_player = fpe.export()
+		assert friendly_player == 1
+
+	def test_battlegrounds(self, parser):
+		with open(logfile("36393_battlegrounds.power.log")) as f:
+			parser.read(f)
+
+		assert len(parser.games) == 1
+		packet_tree = parser.games[0]
+		fpe = FriendlyPlayerExporter(packet_tree)
+		friendly_player = fpe.export()
+		assert friendly_player == 3

tests/test_main.py

@@ -134,11 +134,6 @@ def test_game_initialization():
 		GameTag.CARDTYPE: CardType.PLAYER,
 	}
 
-	# Test that there should be no friendly player
-	fpe = FriendlyPlayerExporter(packet_tree)
-	friendly_player = fpe.export()
-	assert not friendly_player
-
 
 def test_timestamp_parsing():
 	parser = LogParser()