Consolidate and improve readers layer.

Author: GraylinKim

sc2reader/decoders.py

@@ -166,8 +166,8 @@ def __init__(self, contents):
         self.read_bool = functools.partial(self.read_bits, 1)
 
     def done(self):
-        """ Returns true when all bits in the buffer have been used"""
-        return self.tell() == self.length and self._bit_shift == 0
+        """ Returns true when all bytes in the buffer have been used"""
+        return self.tell() == self.length
 
     def byte_align(self):
         """ Moves cursor to the beginning of the next byte """

sc2reader/events/message.py

@@ -10,11 +10,10 @@
 class MessageEvent(Event):
     name = 'MessageEvent'
 
-    def __init__(self, frame, pid, flags):
+    def __init__(self, frame, pid):
         self.pid = pid
         self.frame = frame
         self.second = frame >> 4
-        self.flags = flags
 
     def _str_prefix(self):
         player_name = self.player.name if getattr(self, 'pid', 16) != 16 else "Global"
@@ -28,10 +27,9 @@ def __str__(self):
 class ChatEvent(MessageEvent):
     name = 'ChatEvent'
 
-    def __init__(self, frame, pid, flags, target, text, extension):
-        super(ChatEvent, self).__init__(frame, pid, flags)
+    def __init__(self, frame, pid, target, text):
+        super(ChatEvent, self).__init__(frame, pid)
         self.target = target
-        self.extension = extension
         self.text = text
         self.to_all = (self.target == 0)
         self.to_allies = (self.target == 2)
@@ -42,15 +40,16 @@ def __init__(self, frame, pid, flags, target, text, extension):
 class PacketEvent(MessageEvent):
     name = 'PacketEvent'
 
-    def __init__(self, frame, pid, flags, info):
-        super(PacketEvent, self).__init__(frame, pid, flags)
+    def __init__(self, frame, pid, info):
+        super(PacketEvent, self).__init__(frame, pid)
         self.info = info
 
 
 @loggable
 class PingEvent(MessageEvent):
     name = 'PingEvent'
 
-    def __init__(self, frame, pid, flags, x, y):
-        super(PingEvent, self).__init__(frame, pid, flags)
+    def __init__(self, frame, pid, target, x, y):
+        super(PingEvent, self).__init__(frame, pid)
+        self.target = target
         self.x, self.y = x, y