Loading messages, pings, and packets in load_level 2

Author: GraylinKim

sc2reader/resources.py

@@ -251,6 +251,7 @@ def __init__(self, replay_file, filename=None, load_level=4, **options):
         if load_level >= 2:
             for data_file in {'replay.message.events'}:
                 self._read_data(data_file, self._get_reader(data_file))
+            self.load_messages()
             self.load_players()
 
         # Load events if requested
@@ -455,12 +456,7 @@ def load_players(self):
         hash_input = self.gateway+":"+','.join(player_names)
         self.people_hash = hashlib.sha256(hash_input).hexdigest()
 
-    def load_events(self):
-        # Copy the events over
-        # TODO: the events need to be fixed both on the reader and processor side
-        if 'replay.game.events' in self.raw_data:
-            self.events += self.raw_data['replay.game.events']
-
+    def load_messages(self):
         if 'replay.message.events' in self.raw_data:
             self.messages = self.raw_data['replay.message.events'].messages
             self.pings = self.raw_data['replay.message.events'].packets
@@ -469,6 +465,14 @@ def load_events(self):
 
         self.events = sorted(self.events, key=lambda e: e.frame)
 
+    def load_events(self):
+        # Copy the events over
+        # TODO: the events need to be fixed both on the reader and processor side
+        if 'replay.game.events' in self.raw_data:
+            self.events += self.raw_data['replay.game.events']
+
+        self.events = sorted(self.events, key=lambda e: e.frame)
+
         for event in self.events:
             event.load_context(self)
             # TODO: Should this be documented or removed? I don't like it.