All tests passing with only minor changes.

Now its time to write better tests. This massive commit consolidates all the
replay processors into one giant replay processor function that can operate
on any set of file reads.

Configuration options for full, partial, basic, minimal, and none file reads
have been added to the config.files variable to customize sc2reader usage.

Author: GraylinKim

sc2reader/__init__.py

@@ -29,6 +29,7 @@
 import config
 import objects
 import utils
+import processors
 import exceptions
 
 
@@ -45,16 +46,11 @@ def __init__(self, **user_options):
             It should support any arbitrary number of different Reader objects.
         """
         self.options = config.default_options.copy()
-        self.sys = utils.AttributeDict()
         self.configure(**user_options)
 
     def configure(self, **options):
         self.options.update(options)
 
-        # Depending on the options choosen, the system needs to update related
-        # options and setting in order to get the reading right.
-        self.sys = config.full if self.options.parse_events else config.partial
-
     def read(self, location, **user_options):
         """ Read indicated file or recursively read matching files from the
             specified directory. Returns a replay or a list of replays depending
@@ -107,7 +103,7 @@ def read(self, location, **user_options):
                 archive = mpyq.MPQArchive(location, listfile=False)
 
                 # These files are configured for either full or partial parsing
-                for file in self.sys.files:
+                for file in options.files:
 
                     # For each file, we build a smart buffer object from the
                     # utf-8 encoded bitstream that mpyq extracts.
@@ -143,7 +139,7 @@ def read(self, location, **user_options):
                 #
                 # TODO: Maybe we should switch this to a hook based architecture
                 #       Needs to be able to load "contrib" type processors..
-                for process in self.sys.processors+self.options.processors:
+                for process in [processors.Full]+options.processors:
                     replay = process(replay)
 
                 replays.append(replay)

sc2reader/config.py

@@ -2,6 +2,39 @@
 from .readers import *
 from .utils import AttributeDict
 
+ALL_FILES = [
+    'replay.initData',
+    'replay.details',
+    'replay.attributes.events',
+    'replay.message.events',
+    'replay.game.events'
+]
+
+files = AttributeDict(
+    all=[
+        'replay.initData',
+        'replay.details',
+        'replay.attributes.events',
+        'replay.message.events',
+        'replay.game.events'],
+
+    partial=[
+        'replay.initData',
+        'replay.details',
+        'replay.attributes.events',
+        'replay.message.events',],
+
+    basic=[
+        'replay.initData',
+        'replay.details',
+        'replay.attributes.events'],
+
+    minimal=[
+        'replay.initData',],
+
+    none=[]
+)
+
 default_options = AttributeDict(
     directory="",
     processors=[],
@@ -12,9 +45,11 @@
     exclude_dirs=[],
     recursive=True,
     depth=-1,
-    follow_symlinks=True
+    follow_symlinks=True,
+    files=files.all
 )
 
+"""
 full = AttributeDict(
     files = [
         'replay.initData',
@@ -49,6 +84,7 @@
             RecorderProcessor,
         ],
 )
+"""
 
 class ReaderMap(dict):
     def __init__(self):

sc2reader/objects.py

@@ -13,7 +13,7 @@
 MapData = namedtuple('MapData',['unknown','realm','map_hash'])
 PlayerData = namedtuple('PlayerData',['name','bnet','race','color','unknown1','unknown2','handicap','unknown3','result'])
 ColorData = namedtuple('ColorData',['a','r','g','b'])
-BnetData = namedtuple('BnetData',['unknown1','subregion','unknown2','uid'])
+BnetData = namedtuple('BnetData',['unknown1','unknown2','subregion','uid'])
 PacketData = namedtuple('Packet',['time','pid','flags','packet'])
 PingData = namedtuple('Ping',['time','pid','flags','x','y'])
 MessageData = namedtuple('Message',['time','pid','flags','target','text'])
@@ -67,9 +67,11 @@ def __init__(self, replay_file, **options):
         self.events = list()
         self.events_by_type = defaultdict(list)
         self.results = dict()
-        self.teams = defaultdict(list)
+        self.teams = list()
+        self.team = dict()
         self.observers = list() #Unordered list of Observer
         self.players = list() #Unordered list of Player
+        self.player = PersonDict()
         self.people = list() #Unordered list of Players+Observers
         self.humans = list() #Unordered list of Human People
         self.person = PersonDict() #Maps pid to Player/Observer
@@ -161,15 +163,15 @@ def __init__(self, time, player, x, y):
 
 class Message(object):
 
-    def __init__(self, time, pid, target, text):
-        self.time, self.sender_id, self.target, self.text = time, pid, target, text
+    def __init__(self, time, sender, target, text):
+        self.time,self.sender,self.target,self.text = time,sender,target,text
         self.seconds = time/16
         self.sent_to_all = (self.target == 0)
         self.sent_to_allies = (self.target == 2)
 
     def __str__(self):
         time = ((self.time/16)/60, (self.time/16)%60)
-        return "%s - Player %s - %s" % (time, self.sender_id, self.text)
+        return "%s - Player %s - %s" % (time, self.sender.pid, self.text)
 
     def __repr__(self):
         return str(self)
@@ -227,6 +229,8 @@ def __init__(self, pid, name, replay):
         self.aps = defaultdict(int)
         self.apm = defaultdict(int)
         self.avg_apm = 0
+        # self.result = "Win","Loss","Unknown"
+        # self.team = Team()
         # TODO: set default external interface variables?
 
     @property
@@ -239,6 +243,10 @@ def __str__(self):
     def __repr__(self):
         return str(self)
 
+    @property
+    def result(self):
+        return self.team.result
+
 class Event(object):
     name = 'BaseEvent'
     def apply(self): pass