Merge branch 'optimized'

Author: GraylinKim

.gitignore

@@ -3,4 +3,5 @@
 dist
 build
 sc2reader.egg-info
+replay_profile
 PKG-INFO.txt

profile.py

@@ -0,0 +1,11 @@
+import cProfile
+from pstats import Stats
+
+import os,sys
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+from sc2reader import Replay
+
+
+cProfile.run("Replay('test_replays/build17811/1.sc2replay')","replay_profile")
+stats = Stats("replay_profile")
+stats.strip_dirs().sort_stats("time").print_stats(15)

sc2reader/parsers.py

@@ -143,7 +143,7 @@ def load(self, replay, filecontents):
         replay.messages = list()
         bytes, time = ByteStream(filecontents), 0
 
-        while(bytes.length!=0):
+        while(bytes.remaining!=0):
             time += bytes.get_timestamp()
             player_id = bytes.get_big_int(1) & 0x0F
             flags = bytes.get_big_int(1)
@@ -221,7 +221,7 @@ def load(self, replay, filecontents):
         #set up an event list,  start the timer,  and process the file contents
         replay.events, elapsed_time, bytes = list(), 0, ByteStream(filecontents)
 
-        while bytes.length > 0:
+        while bytes.remaining > 0:
             #First section is always a timestamp marking the elapsed time
             #since the last eventObjectlisted
             location = hex(bytes.cursor)

sc2reader/utils.py

@@ -3,20 +3,21 @@ class ByteStream(object):
     """Most functions will return the byte_code as well when requested"""
 
     def __init__(self, stream):
+        self.__cbyte = 0
         self.cursor = -1 #First element is 0
         self.stream = stream.encode("hex").upper()
 
     def get_big(self, number, byte_code=False):
         #Do a sanity check, if streams are parsed right this won't ever happen
-        if len(self.stream) < number*2:
-            msg = "Stream is only %s bytes long; %s bytes requested"
-            raise ValueError(msg % (self.length, number) )
+        if len(self.stream)-self.__cbyte < number*2:
+            msg = "Stream only has %s bytes left; %s bytes requested"
+            raise ValueError(msg % (self.remaining, number) )
 
         #For big endian, the byte_string is the result
-        result = self.stream[:number*2]
+        result = self.stream[self.__cbyte:self.__cbyte+number*2]
 
         #Move the ByteStream forward
-        self.stream = self.stream[number*2:]
+        self.__cbyte = self.__cbyte + number*2
         self.cursor = self.cursor + number
 
         if byte_code:
@@ -31,7 +32,7 @@ def skip(self, number, byte_code=False):
         self.get_big(number)
 
     def peek(self, number):
-        return self.stream[:number*2]
+        return self.stream[self.__cbyte:self.__cbyte + number*2]
 
     def get_little(self, number, byte_code=False):
         #Get a list of the next 'number' of bytes from the stream
@@ -166,5 +167,5 @@ def parse_serialized_data(self, byte_code=False):
         return data
 
     @property
-    def length(self):
-        return len(self.stream)
+    def remaining(self):
+        return len(self.stream)-self.__cbyte