Integrates new PlayerDict utility class that keeps a double index and updated tests.

The Replay.player dict is now a PlayerDict (subclassed) which retains all the dict functionality and compatibility while making its values accessible by both pid and player name. For example:

  test = Player { pid = 1, name = "Tester" }
  d = PlayerDict(Tester=test) or
    d = PlayerDict(); d[1] = test or
    d = PlayerDict(); d["Tester"] = test
  d[1] and d["Tester"] will retrieve the same player.

It should be noted that deletion can only be done by the players pid at this time. See the tests for example usage information.

Author: GraylinKim

sc2reader/replay.py

@@ -4,9 +4,8 @@
 from mpyq import MPQArchive
 
 import parsers
-from utils import ByteStream
-
-
+from utils import ByteStream,PlayerDict
+        
 class Replay(object):
 
     def __init__(self, replay, partial_parse=True, full_parse=True):
@@ -22,7 +21,7 @@ def __init__(self, replay, partial_parse=True, full_parse=True):
         self.results = dict()
         self.teams = defaultdict(list)
         self.players = list() #Unordered list of Player
-        self.player = dict() #Maps pid to Player
+        self.player = PlayerDict() #Maps pid to Player
         self.events_by_type = dict()
         self.attributes = list()
         self.length = None # (minutes, seconds) tuple

sc2reader/utils.py

@@ -1,3 +1,37 @@
+class PlayerDict(dict):
+    def __init__(self,*args,**kwargs):
+        self._key_map = dict()
+        
+        if args:
+            print args
+            for arg in args[0]:
+                self[arg[0]] = arg[1]
+                
+        if kwargs:
+            print kwargs
+            for key,value in kwargs.iteritems():
+                self[key] = value
+        
+    def __getitem__(self,key):
+        if isinstance(key,str):
+            key = self._key_map[key]
+
+        return super(PlayerDict,self).__getitem__(key)
+
+    def __setitem__(self,key,value):
+        #if not isinstance(value,Player):
+        #    raise TypeError("Values must be of the Player class")
+            
+        if isinstance(key,str):
+            self._key_map[key] = value.pid
+            key = value.pid
+        elif isinstance(key,int):
+            self._key_map[value.name] = key
+            
+        super(PlayerDict,self).__setitem__(value.pid,value)
+        
+        
+        
 class ByteStream(object):
     """Track and return the bytes for investigative and debugging purposes"""
     """Most functions will return the byte_code as well when requested"""

test_replays/test_all.py

@@ -46,13 +46,13 @@ def test_1():
     assert len(replay.players) == 2
     assert replay.player[1].name == "Emperor"
     assert replay.player[2].name == "Boom"
-    emperor = find(lambda player: player.name == "Emperor", replay.players)
+    emperor = replay.player['Emperor']
     assert emperor.team == 1
     assert emperor.choosen_race == "Protoss"
     assert emperor.actual_race == "Protoss"
     assert emperor.recorder == False
 
-    boom = find(lambda player: player.name == "Boom", replay.players)
+    boom = replay.player['Boom']
     assert boom.team == 2
     assert boom.choosen_race == "Terran"
     assert boom.actual_race == "Terran"
@@ -116,17 +116,15 @@ def test_3v3():
 def test_random_player():
     replay = Replay("test_replays/build17811/3.sc2replay")
 
-    gogeta = find(lambda player: player.name == "Gogeta", replay.players)
+    gogeta = replay.player['Gogeta']
     assert gogeta.choosen_race == "Random"
     assert gogeta.actual_race == "Terran"
 
 def test_us_realm():
     replay = Replay("test_replays/build17811/5.sc2replay")
-    shades = find(lambda player: player.name == "ShadesofGray", replay.players)
-    dawn = find(lambda player: player.name == "reddawn", replay.players)
-
-    assert shades.url == "http://us.battle.net/sc2/en/profile/2358439/1/ShadesofGray/"
-    assert dawn.url == "http://us.battle.net/sc2/en/profile/2198663/1/reddawn/"
+    
+    assert replay.player['ShadesofGray'].url == "http://us.battle.net/sc2/en/profile/2358439/1/ShadesofGray/"
+    assert replay.player['reddawn'].url == "http://us.battle.net/sc2/en/profile/2198663/1/reddawn/"
 
 
 def test_encrypted():