Fixed a small bug and added player.is_ai

Author: Prillan

sc2reader/objects.py

@@ -254,10 +254,16 @@ class PlayerSummary():
 
     #: The index of the player in the game
     pid = int()
+    
+    #: The index of the players team in the game
+    teamid = int()
 
     #: The race the player used
     race = str()
 
+    #: If the player is a computer
+    is_ai = False
+
     #: Battle.Net id of the player
     bnetid = int()
 
@@ -283,8 +289,11 @@ def __init__(self, pid):
         self.pid = pid
 
     def __str__(self):
-        return '{} - {}/{}/'.format(self.race, self.subregion, self.bnetid)
-
+        if not self.is_ai:
+            return '{} - {} - {}/{}/'.format(self.teamid, self.race, self.subregion, self.bnetid)
+        else:
+            return '{} - {} - AI'.format(self.teamid, self.race) 
+        
     def get_stats(self):
         s = ''
         for k in self.stats:

sc2reader/resources.py

@@ -426,7 +426,7 @@ class GameSummary(Resource):
     #: time2 seems to be more accurate than time1
     time2 = int()
 
-    #: Players, a list of :class`PlayerSummary` from the game
+    #: Players, a dict of :class`PlayerSummary` from the game
     players = list()
 
     #: Map image urls
@@ -437,6 +437,11 @@ class GameSummary(Resource):
 
     def __init__(self, summary_file, filename=None, **options):
         super(GameSummary, self).__init__(summary_file, filename,**options)
+
+        self.players = list()
+        self.image_urls = list()
+        self.localization_urls = dict()
+
         self.data = zlib.decompress(summary_file.read()[16:])
         self.parts = list()
         buffer = utils.ReplayBuffer(self.data)
@@ -466,18 +471,26 @@ def __init__(self, summary_file, filename=None, **options):
 
             player = PlayerSummary(player_struct[0][0])
             player.race = RACE_CODES[''.join(reversed(player_struct[2]))]
-            player.bnetid = player_struct[0][1][0][3]
-            player.subregion = player_struct[0][1][0][2]
-
-            # int
-            player.unknown1 = player_struct[0][1][0]
-            # {0:long1, 1:long2}
-            # Example:
-            # { 0: 3405691582L, 1: 11402158793782460416L}
-            player.unknown2 = player_struct[0][1][1]
+            player.teamid = player_struct[1][0]
 
+            # Is the player an ai?
+            if type(player_struct[0][1]) == type(int()):
+                player.is_ai = True
+            else:
+                player.is_ai = False
+                
+                player.bnetid = player_struct[0][1][0][3]
+                player.subregion = player_struct[0][1][0][2]
+
+                # int
+                player.unknown1 = player_struct[0][1][0]
+                # {0:long1, 1:long2}
+                # Example:
+                # { 0: 3405691582L, 1: 11402158793782460416L}
+                player.unknown2 = player_struct[0][1][1]
+            
             self.players.append(player)
-        
+
         # Parse graph and stats stucts, for each player
         for p in self.players: