Move the header parsing into the Replay class.

The code fits better in the constructor. The constructor has also
been changed to keep a reference to a copy of the replay's reader
configuration.

Author: Graylin Kim

sc2reader/__init__.py

@@ -1,9 +1,11 @@
 import os
 
+import copy
+
 from config import FULL, PARTIAL, CUSTOM, FILES, PROCESSORS, READERS
 from mpyq import MPQArchive
 from objects import Replay
-from utils import ReplayBuffer, read_header
+from utils import ReplayBuffer
 
 __version__ = "0.3.0"
 __author__ = "Graylin Kim <[email protected]>"
@@ -14,7 +16,7 @@ class SC2Reader(object):
         <<usage documentation here>>
     '''
 
-    def __init__(self, parse_type="FULL", directory="", processors=[], debug=False, files=[], verbose=False):
+    def __init__(self, parse_type="FULL", directory="", processors=[], debug=False, files=[], verbose=False, copy=copy.copy):
         try:
             #Update and save the reader configuration
             parse_type = parse_type.upper()
@@ -38,8 +40,7 @@ def read(self, location):
 
         else:
             with open(location) as replay_file:
-                release,frames = read_header(replay_file)
-                replay = Replay(location,release,frames)
+                replay = Replay(self.copy(self),replay_file)
                 archive = MPQArchive(location,listfile=False)
 
                 for file in self.files:

sc2reader/objects.py

@@ -3,25 +3,25 @@
 
 from sc2reader.constants import *
 from sc2reader.data import GameObject, ABILITIES
-from sc2reader.utils import PersonDict,Selection
-
+from sc2reader.utils import PersonDict, Selection, read_header
 
 class Replay(object):
 
-    def __init__(self, filename, release, frames=0):
-        #Split and offset for matching indexes if they pass in the release string
-        if isinstance(release,basestring): release = [None]+release.split('.') 
-        
-        #Assign all the relevant information to the replay object
-        self.build = release[4]
-        self.versions = (release[1], release[2], release[3], release[4])
-        self.release_string = "%s.%s.%s.%s" % self.versions
-        self.frames, self.seconds = (frames, frames/16)
+    def __init__(self, reader, replay_file):
+        #Useful references
+        self.reader = reader
+        self.filename = replay_file.name
+
+        #header information
+        self.versions,self.frames = read_header(replay_file)
+        self.build = self.versions[4]
+        self.release_string = "%s.%s.%s.%s" % tuple(self.versions[1:5])
+        self.seconds = self.frames/16
         self.length = (self.seconds/60, self.seconds%60)
 
+        #default values, filled in during file read
         self.player_names = list()
         self.other_people = set()
-        self.filename = filename
         self.speed = ""
         self.type = ""
         self.category = ""
@@ -43,7 +43,7 @@ def __init__(self, filename, release, frames=0):
         self.winner_known = False
 
         # Set in parsers.DetailParser.load, should we hide this?
-        self.file_time = None # Probably number milliseconds since EPOCH
+        self.file_time = None
 
         # TODO: Test EPOCH differences between MacOsX and Windows
         # http://en.wikipedia.org/wiki/Epoch_(reference_date)

sc2reader/utils.py

@@ -507,5 +507,5 @@ def read_header(file):
     data_size = buffer.read_int(LITTLE_ENDIAN)
     header_data = buffer.read_data_struct()
 
-    #return the release array (version,major,minor,build) and frame count
-    return header_data[1],header_data[3]
+    #array [unknown,version,major,minor,build,unknown] and frame count
+    return header_data[1].values(),header_data[3]