Creates a config.py module and cleans up some basic code organization

Author: GraylinKim

sc2reader/__init__.py

@@ -1,33 +1,7 @@
-from mpyq import MPQArchive
-from utils import ByteStream
-from objects import Replay
-from readers import *
-from processors import *
-from collections import OrderedDict
-
-__version__ = "0.1.0"
-
 import os
 
-class DefaultConfig(object):
-    def __init__(self):
-        self.readers = OrderedDict()
-        self.readers['replay.initData'] = [ ReplayInitDataReader() ]
-        self.readers['replay.details'] = [ ReplayDetailsReader() ]
-        self.readers['replay.attributes.events'] = [ AttributeEventsReader_17326(), AttributeEventsReader() ]
-        self.readers['replay.message.events'] = [ MessageEventsReader() ]
-        self.readers['replay.game.events'] = [ GameEventsReader_17326(), GameEventsReader_16561(), GameEventsReader() ]
-        
-        self.processors = [
-                PeopleProcessor,
-                AttributeProcessor,
-                TeamsProcessor,
-                MessageProcessor,
-                RecorderProcessor,
-                EventProcessor,
-                ApmProcessor,
-                ResultsProcessor
-            ]
+from mpyq import MPQArchive
+from config import DefaultConfig
 
 def read(location,config=DefaultConfig()):
     if not os.path.exists(location):
@@ -47,7 +21,7 @@ def read_file(filename,config=DefaultConfig()):
 
     with open(filename) as replay_file:
         release,frames = read_header(replay_file)
-        replay = Replay(filename,release,frames)
+        replay = config.ReplayClass(filename,release,frames)
         archive = MPQArchive(filename,listfile=False)
 
         #Extract and Parse the relevant files
@@ -64,23 +38,6 @@ def read_file(filename,config=DefaultConfig()):
             replay = process(replay)
 
         return replay
-    
-def read_header(file):
-    source = ByteStream(file.read())
-    
-    #Check the file type for the MPQ header bytes
-    if source.get_hex(4).upper() != "4D50511B":
-        raise ValueError("File '%s' is not an MPQ file" % file.name)
-    
-    #Extract replay header data, we don't actually use this for anything
-    max_data_size = source.get_little_32() #possibly data max size
-    header_offset = source.get_little_32() #Offset of the second header
-    data_size = source.get_little_32()     #possibly data size
-    
-    #Extract replay attributes from the mpq
-    data = source.parse_serialized_data()
-    
-    #return the release and frames information
-    return data[1],data[3]
 
-__all__ = [DefaultConfig,read,read_file]
+__all__ = [DefaultConfig,read,read_file]
+__version__ = "0.1.0"

sc2reader/config.py

@@ -0,0 +1,27 @@
+from collections import OrderedDict
+
+from sc2reader.objects import Replay
+from sc2reader.processors import *
+from sc2reader.readers import *
+
+class DefaultConfig(object):
+    def __init__(self):
+        self.ReplayClass = Replay
+        
+        self.readers = OrderedDict()
+        self.readers['replay.initData'] = [ ReplayInitDataReader() ]
+        self.readers['replay.details'] = [ ReplayDetailsReader() ]
+        self.readers['replay.attributes.events'] = [ AttributeEventsReader_17326(), AttributeEventsReader() ]
+        self.readers['replay.message.events'] = [ MessageEventsReader() ]
+        self.readers['replay.game.events'] = [ GameEventsReader_17326(), GameEventsReader_16561(), GameEventsReader() ]
+        
+        self.processors = [
+                PeopleProcessor,
+                AttributeProcessor,
+                TeamsProcessor,
+                MessageProcessor,
+                RecorderProcessor,
+                EventProcessor,
+                ApmProcessor,
+                ResultsProcessor
+            ]

sc2reader/replay.py

@@ -1,3 +1,7 @@
+from cStringIO import StringIO
+from os import SEEK_CUR, SEEK_END
+from struct import unpack
+
 class PersonDict(dict):
     """Delete is supported on the pid index only"""
     def __init__(self, *args, **kwargs):
@@ -27,11 +31,6 @@ def __setitem__(self, key, value):
             self._key_map[value.name] = key
 
         super(PersonDict, self).__setitem__(value.pid, value)
-        
-        
-from cStringIO import StringIO
-from os import SEEK_CUR, SEEK_END
-from struct import unpack
 
 class ByteStream(object):
     def __init__(self, stream):
@@ -177,4 +176,22 @@ def parse_serialized_data(self):
         else:
             raise TypeError("Uknown Data Type: '%s'" % datatype)
 
-        return data
+        return data
+        
+def read_header(file):
+    source = ByteStream(file.read())
+    
+    #Check the file type for the MPQ header bytes
+    if source.get_hex(4).upper() != "4D50511B":
+        raise ValueError("File '%s' is not an MPQ file" % file.name)
+    
+    #Extract replay header data, we don't actually use this for anything
+    max_data_size = source.get_little_32() #possibly data max size
+    header_offset = source.get_little_32() #Offset of the second header
+    data_size = source.get_little_32()     #possibly data size
+    
+    #Extract replay attributes from the mpq
+    data = source.parse_serialized_data()
+    
+    #return the release and frames information
+    return data[1],data[3]