get clantag breaking test to pass. upgrade WoL 2.0.4 to use DetailsReader_Beta_24764 instead of DetailsReader_22612 despite not having a breaking test for that change. all tests pass now

Author: dsjoerg

sc2reader/readers.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+import re
 from collections import defaultdict
 from itertools import chain
 
@@ -119,6 +120,10 @@ class DetailsReader_Base(Reader):
     PlayerData = namedtuple('PlayerData',['name','bnet','race','color','unknown1','unknown2','handicap','unknown3','result'])
     Details = namedtuple('Details',['players','map','unknown1','unknown2','os','file_time','utc_adjustment','unknown4','unknown5','unknown6','unknown7','unknown8','unknown9','unknown10'])
 
+    # '[OTZ]<sp/>Skull'  -->  'Skull'
+    def stripclan(self, name):
+        return re.sub(r'.*<sp/>', '', name)
+
     def __call__(self, data, replay):
         # The entire details file is just a serialized data structure
         #
@@ -173,6 +178,7 @@ def __call__(self, data, replay):
         # from the bottom up instead of in place from the top down.
         players = list()
         for pdata in details[0]:
+            pdata[0] = self.stripclan(pdata[0])
             pdata[1] = BnetData(*ordered_values(pdata[1]))
             pdata[3] = ColorData(*ordered_values(pdata[3]))
             player = self.PlayerData(*ordered_values(pdata))

sc2reader/resources.py

@@ -533,11 +533,11 @@ def register_datapack(self, datapack, filterfunc=lambda r: True):
     def register_default_readers(self):
         """Registers factory default readers."""
         self.register_reader('replay.details', readers.DetailsReader_Base(), lambda r: r.build < 22612)
-        self.register_reader('replay.details', readers.DetailsReader_22612(), lambda r: r.build >= 22612 and r.expansion=='WoL')
+        self.register_reader('replay.details', readers.DetailsReader_22612(), lambda r: r.build >= 22612 and r.build < 24764 and r.expansion=='WoL')
         self.register_reader('replay.details', readers.DetailsReader_Beta(), lambda r: r.build < 24764 and r.expansion=='HotS')
-        self.register_reader('replay.details', readers.DetailsReader_Beta_24764(), lambda r: r.build >= 24764 and r.expansion=='HotS')
-        self.register_reader('replay.initData', readers.InitDataReader_Base(), lambda r: r.expansion=='WoL' or r.build < 24764)
-        self.register_reader('replay.initData', readers.InitDataReader_24764(), lambda r: r.expansion=='HotS' and r.build >= 24764)
+        self.register_reader('replay.details', readers.DetailsReader_Beta_24764(), lambda r: r.build >= 24764)
+        self.register_reader('replay.initData', readers.InitDataReader_Base(), lambda r: r.build < 24764)
+        self.register_reader('replay.initData', readers.InitDataReader_24764(), lambda r: r.build >= 24764)
         self.register_reader('replay.message.events', readers.MessageEventsReader_Base(), lambda r: r.build < 24247 or r.expansion=='WoL')
         self.register_reader('replay.message.events', readers.MessageEventsReader_Beta_24247(), lambda r: r.build >= 24247 and r.expansion=='HotS')
         self.register_reader('replay.attributes.events', readers.AttributesEventsReader_Base(), lambda r: r.build <  17326)

test_replays/.DS_Store

@@ -222,3 +222,7 @@ def test_oracle_parsing():
 def test_clan_players():
     replay = sc2reader.load_replay("test_replays/2.0.4.24944/Lunar Colony V.SC2Replay")
     assert len(replay.people) == 4
+
+def test_WoL_204():
+    replay = sc2reader.load_replay("test_replays/2.0.4.24944/ggtracker_1789768.SC2Replay")
+    assert len(replay.people) == 2