Adds more explicit support for choosen vs actual race played and updates tests

Author: GraylinKim

sc2reader/objects.py

@@ -28,9 +28,9 @@ def __init__(self, data):
 
         elif self.id == 0x0BB9:
             self.name = "Race"
-            if   self.value == "Prot": self.value = "Protoss"
-            elif self.value == "Terr": self.value = "Terran"
-            elif self.value == "Rand": self.value = "Random"
+            if   self.value.lower() == "prot": self.value = "Protoss"
+            elif self.value.lower() == "terr": self.value = "Terran"
+            elif self.value.lower() == "rand": self.value = "Random"
 
         elif self.id == 0x0BBA:
             self.name = "Color"
@@ -139,21 +139,24 @@ def __repr__(self):
 
 class Player(object):
 
+    url_template = "http://%s.battle.net/sc2/en/profile/%s/%s/%s/"
+    
     def __init__(self, pid, data, realm="us"):
         self.pid = pid
         self.realm = realm
         self.name = data[0].decode("hex")
         self.uid = data[1][4]
         self.uidIndex = data[1][2]
-        self.url = "http://%s.battle.net/sc2/en/profile/%s/%s/%s/" % (self.realm, self.uid, self.uidIndex, self.name)
-        self.race = data[2].decode("hex")
+        self.url = self.url_template % (self.realm, self.uid, self.uidIndex, self.name)
+        self.actual_race = data[2].decode("hex")
+        self.choosen_race = "" # Populated from the replay.attribute.events file
         self.rgba = dict([
                 ['r', data[3][1]], 
                 ['g', data[3][2]], 
                 ['b', data[3][3]], 
                 ['a', data[3][0]], 
             ])
-        self.recorder = True
+        self.recorder = True # Actual recorder will be determined using the replay.message.events file
         self.handicap = data[6]
         self.team = None # A number to be supplied later
         self.type = "" # Human or Computer

sc2reader/parsers.py

@@ -106,7 +106,7 @@ def load(self, replay, filecontents):
             player = replay.player[pid]
             player.color = attributes['Color']
             player.team = attributes['Teams'+replay.type]
-            player.race2 = attributes['Race']
+            player.choosen_race = attributes['Race']
             player.difficulty = attributes['Difficulty']
             #Computer players can't record games
             player.type = attributes['Player Type']

test_replays/test_all.py

@@ -49,12 +49,14 @@ def test_1():
     assert replay.player[2].name == "Boom"
     emperor = find(lambda player: player.name == "Emperor", replay.players)
     assert emperor.team == 1
-    assert emperor.race == "Protoss"
+    assert emperor.choosen_race == "Protoss"
+    assert emperor.actual_race == "Protoss"
     assert emperor.recorder == False
 
     boom = find(lambda player: player.name == "Boom", replay.players)
     assert boom.team == 2
-    assert boom.race == "Terran"
+    assert boom.choosen_race == "Terran"
+    assert boom.actual_race == "Terran"
     assert boom.recorder == True
 
     for player in replay.players: