Split the toDict and jsonEncode processing. Make the jsonEncoding more flexible.

Author: GraylinKim

sc2reader/processors/__init__.py

@@ -1,2 +1,5 @@
+from __future__ import absolute_import
+
 from sc2reader.processors.full import Full
-from sc2reader.processors.json import jsonProcessor
+from sc2reader.processors.jsonencode import jsonEncode, jsonEncoder
+from sc2reader.processors.todict import toDict

sc2reader/processors/jsonencode.py

@@ -0,0 +1,30 @@
+from __future__ import absolute_import
+
+from datetime import datetime
+from sc2reader.processors.todict import toDict
+
+
+try:
+    import json
+except:
+    import simplejson as json
+
+
+class __JSONDateEncoder__(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, datetime):
+            return obj.strftime("%Y-%m-%d %H:%M:%S")
+        return json.JSONEncoder.default(self, obj)
+
+class jsonEncoder(object):
+
+    def __init__(self, **user_options):
+        self.options = dict(cls=__JSONDateEncoder__)
+        self.options.update(user_options)
+
+    def __call__(self, replay):
+        return json.dumps(toDict(replay), **self.options)
+
+
+def jsonEncode(replay):
+    return jsonEncoder().__calll__(replay)

sc2reader/processors/json.py sc2reader/processors/todict.pysc2reader/processors/json.py renamed to sc2reader/processors/todict.py

@@ -1,23 +1,12 @@
 from __future__ import absolute_import
-from datetime import datetime
-import functools
-try:
-    import json
-except:
-    import simplejson as json
-
-class __JSONDateEncoder__(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, datetime):
-            return obj.strftime("%Y-%m-%d %H:%M:%S")
-        return json.JSONEncoder.default(self, obj)
 
+import functools
 
-def jsonProcessor(replay):
+def toDict(replay):
     def __getattr(object, name, default):
         return getattr(object, name, default)
     _getattr = functools.partial(__getattr, default=None)
-    json_data = {
+    data = {
         'gateway': _getattr(replay, 'gateway'),
         'map': _getattr(replay, 'map'),
         'file_time': _getattr(replay, 'file_time'),
@@ -58,14 +47,13 @@ def __getattr(object, name, default):
                 'is_public': message.sent_to_all
             })
         players.append(p)
-    json_data['players'] = players
+    data['players'] = players
     observers = []
     for observer in replay.observers:
         observers.append({
             'name': _getattr(observer, 'name'),
             'messages': _getattr(observer, 'messages', default=[]),
             'pid': _getattr(observer, 'pid'),
         })
-    json_data['observers'] = observers
-    encoded = json.dumps(json_data, cls=__JSONDateEncoder__)
-    return encoded
+    data['observers'] = observers
+    return data