Fixes several small parsing bugs. Includes an additional cancel flag for abilities, and finally fixes the type 0x03, code 0x08 event for good.

Author: GraylinKim

sc2reader/parsers.py

@@ -215,7 +215,7 @@ def parse_ability_event(self, buffer, frames, type, code, pid):
             end = buffer.peek(35)
             ability = buffer.read_byte() << 8 | buffer.read_byte()
 
-            if flag in (0x29, 0x19, 0x14): # cancels
+            if flag in (0x29, 0x19, 0x14, 0x0c): # cancels
                 # creation autoid number / object id
                 ability = ability << 8 | buffer.read_byte()
                 created_id = buffer.read_object_id()
@@ -300,13 +300,10 @@ def parse_camera87_event(self, buffer, frames, type, code, pid):
         return CameraMovementEvent(frames, pid, type, code)
 
     def parse_camera08_event(self, buffer, frames, type, code, pid):
-        short = buffer.read_short(BIG_ENDIAN)
-        count = short & 0x0F
-        #print "Short %X, Count %X, Skipped %X" % (short,count,count << 3)
-        
-        buffer.skip( count << 3 )
+        flags, extra = buffer.read_byte(), buffer.read_byte()
+        buffer.skip( (flags&0x0F) << 3 )
         return CameraMovementEvent(frames, pid, type, code)
-        
+
     def parse_camera18_event(self, buffer, frames, type, code, pid):
         buffer.skip(162)
         return CameraMovementEvent(frames, pid, type, code)
@@ -348,6 +345,10 @@ def parse_04X2_event(self, buffer, frames, type, code, pid):
         buffer.skip(2)
         return UnknownEvent(frames, pid, type, code)
 
+    def parse_0488_event(self, buffer, frames, type, code, pid):
+        buffer.skip(4) #Always 00 00 00 01 ?? or 00 00 00 03
+        return UnknownEvent(frames, pid, type, code)
+        
     def parse_04XC_event(self, buffer, frames, type, code, pid):
         #no body
         return UnknownEvent(frames, pid, type, code)

sc2reader/readers.py

@@ -158,17 +158,18 @@ def read(self, buffer, replay):
             start = buffer.cursor
 
             frames += buffer.read_timestamp()
-            #print frames
             pid = buffer.shift(5)
             type, code = buffer.shift(3), buffer.read_byte()
-            #print "%s - %s" % (hex(type),hex(code))
-            parser = PARSERS[type](code)
-            
+            #print "Type %X - Code %X - Start %X" % (type,code,start)
+
+            parser = PARSERS.get(type,lambda x:None)(code)
+
             if parser == None:
-                msg = "Unknown event: %s - %s at %s"
-                raise TypeError(msg % (hex(type), hex(code), hex(start)))
+                msg = "Unknown event: %X - %X at %X"
+                raise TypeError(msg % (type, code, start))
 
             event = parser(buffer, frames, type, code, pid)
+
             buffer.align()
             event.bytes = buffer.read_range(start,buffer.cursor)
             replay.events.append(event)
@@ -200,6 +201,7 @@ def get_unknown4_parser(self, code):
         if   code == 0x16: return self.parse_0416_event
         elif code == 0xC6: return self.parse_04C6_event
         elif code == 0x87: return self.parse_0487_event
+        elif code == 0x88: return self.parse_0488_event
         elif code == 0x00: return self.parse_0400_event
         elif code & 0x0F == 0x02: return self.parse_04X2_event
         elif code & 0x0F == 0x0C: return self.parse_04XC_event