Skip to content

Commit f384f16

Browse files
committed
Fixes #99, strip clan name from player name.
1 parent 46be0a4 commit f384f16

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

sc2reader/resources.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,9 @@ def createObserver(pid, name, attributes):
345345

346346
def createPlayer(pid, pdata, attributes):
347347
# make sure to strip the clan tag out of the name
348-
name = pdata.name.split("]")[-1]
348+
# in newer replays, the clan tag can be separated from the
349+
# player name with a <sp/> symbol. It should also be stripped.
350+
name = pdata.name.split("]",1)[-1].split(">",1)[-1]
349351
player = Player(pid, name)
350352

351353
# In some beta patches attribute information is missing
@@ -536,9 +538,9 @@ def register_default_readers(self):
536538
self.register_reader('replay.details', readers.DetailsReader_Base(), lambda r: r.build < 22612)
537539
self.register_reader('replay.details', readers.DetailsReader_22612(), lambda r: r.build >= 22612 and r.expansion=='WoL')
538540
self.register_reader('replay.details', readers.DetailsReader_Beta(), lambda r: r.build < 24764 and r.expansion=='HotS')
539-
self.register_reader('replay.details', readers.DetailsReader_Beta_24764(), lambda r: r.build >= 24764 and r.expansion=='HotS')
540-
self.register_reader('replay.initData', readers.InitDataReader_Base(), lambda r: r.expansion=='WoL' or r.build < 24764)
541-
self.register_reader('replay.initData', readers.InitDataReader_24764(), lambda r: r.expansion=='HotS' and r.build >= 24764)
541+
self.register_reader('replay.details', readers.DetailsReader_Beta_24764(), lambda r: r.build >= 24764)
542+
self.register_reader('replay.initData', readers.InitDataReader_Base(), lambda r: r.build < 24764)
543+
self.register_reader('replay.initData', readers.InitDataReader_24764(), lambda r: r.build >= 24764)
542544
self.register_reader('replay.message.events', readers.MessageEventsReader_Base(), lambda r: r.build < 24247 or r.expansion=='WoL')
543545
self.register_reader('replay.message.events', readers.MessageEventsReader_Beta_24247(), lambda r: r.build >= 24247 and r.expansion=='HotS')
544546
self.register_reader('replay.attributes.events', readers.AttributesEventsReader_Base(), lambda r: r.build < 17326)

0 commit comments

Comments
 (0)