Fixes and improvements to game summaries.

Author: GraylinKim

sc2reader/resources.py

@@ -547,14 +547,16 @@ class GameSummary(Resource):
     def __init__(self, summary_file, filename=None, **options):
         super(GameSummary, self).__init__(summary_file, filename,**options)
 
-        self.players = dict()
+        self.team = dict()
+        self.teams = list()
+        self.players = list()
+        self.winners = list()
+        self.player = dict()
         self.build_orders = dict()
         self.image_urls = list()
         self.localization_urls = dict()
         self.lobby_properties = dict()
         self.lobby_player_properties = dict()
-        self.teams = dict()
-        self.winners = list()
 
         self.data = zlib.decompress(summary_file.read()[16:])
         self.parts = list()
@@ -614,14 +616,18 @@ def __init__(self, summary_file, filename=None, **options):
                 # { 0: 3405691582L, 1: 11402158793782460416L}
                 player.unknown2 = player_struct[0][1][1]
 
-            self.players[player.pid] = player
+            self.players.append(player)
+            self.player[player.pid] = player
+
             if not player.teamid in self.teams:
-                self.teams[player.teamid] = list()
-            self.teams[player.teamid].append(player.pid)
+                self.team[player.teamid] = list()
+            self.team[player.teamid].append(player.pid)
+        self.teams = [self.team[tid] for tid in sorted(self.team.keys())]
+
 
         # Parse graph and stats stucts, for each player
-        for pid in self.players:
-            p = self.players[pid]
+        for pid, p in self.player.items():
+            print type(pid), type(p)
             # Graph stuff
             xy = [(o[2], o[0]) for o in self.parts[4][0][2][1][p.pid]]
             p.army_graph = Graph([], [], xy_list=xy)
@@ -659,8 +665,7 @@ def __init__(self, summary_file, filename=None, **options):
         bo_structs.append(self.parts[4][0][3:])
 
         # This might not be the most effective way, but it works
-        for pid in self.players:
-            p = self.players[pid]
+        for pid, p in self.player.items():
             bo = list()
             for bo_struct in bo_structs:
                 for order in bo_struct:

sc2reader/scripts/sc2boprinter.py

@@ -6,34 +6,19 @@
 Usage: python sc2boprinter.py FOLDER
 """
 
-import sys, os, argparse
-from sc2reader.factories import SC2Factory
+import sys, os, argparse, sc2reader
 
-def get(dir):
-    factory = SC2Factory()
-    
-    res = list()
-    
-    for file in os.listdir(dir):
-        if file.rfind('.s2gs') > 0:
-            res.append(factory.load_game_summary(os.path.join(dir, file)))
-            
-    return res
 def main():
     parser = argparse.ArgumentParser(description="Prints build orders from all s2gs files in FOLDER")
-    parser.add_argument('path', metavar='filename', type=str, nargs=1,
-                        help="Path to a folder")
-
+    parser.add_argument('path', metavar='filename', type=str, nargs=1, help="Path to a folder")
     args = parser.parse_args()
-    res = get(args.path[0])
-    for r in res:
-        if r.__class__.__name__ == "GameSummary":
-            print("\n"+"-"*40+"\n")
-            print("= {} =".format(r))
-            for p in r.players:
-                print("== {} - {} ==".format(p.race, p.bnetid if not p.is_ai else "AI"))
-                for order in r.build_orders[p.pid]:
-                    print("{:0>2}:{:0>2}  {:<35} {:>2}/{}".format(order['time'] / 60,
+    for r in sc2reader.load_game_summaries(args.path):
+        print("\n"+"-"*40+"\n")
+        print("= {} =".format(r))
+        for p in r.players:
+            print("== {} - {} ==".format(p.race, p.bnetid if not p.is_ai else "AI"))
+            for order in r.build_orders[p.pid]:
+                print("{:0>2}:{:0>2}  {:<35} {:>2}/{}".format(order['time'] / 60,
                                                                   order['time'] % 60,
                                                                   order['order']['name'],
                                                                   order['supply'],