Add new RangeMap lookup utility to handle variation in SC2Reader builds.

Author: GraylinKim

sc2reader/config.py

@@ -1,6 +1,6 @@
 from .processors import *
 from .readers import *
-from .utils import AttributeDict
+from .utils import AttributeDict, RangeMap
 
 ALL_FILES = [
     'replay.initData',
@@ -50,73 +50,44 @@
     apply=False
 )
 
-class ReaderMap(dict):
-    def __init__(self):
-        self.set1 = {
-                'replay.initData': InitDataReader(),
-                'replay.details': DetailsReader(),
-                'replay.attributes.events': AttributeEventsReader(),
-                'replay.message.events': MessageEventsReader(),
-                'replay.game.events': GameEventsReader(),
-            }
 
-        self.set2 = {
-                'replay.initData': InitDataReader(),
-                'replay.details': DetailsReader(),
-                'replay.attributes.events': AttributeEventsReader(),
-                'replay.message.events': MessageEventsReader(),
-                'replay.game.events': GameEventsReader_16561(),
-            }
-
-        self.set3 = {
-                'replay.initData': InitDataReader(),
-                'replay.details': DetailsReader(),
-                'replay.attributes.events': AttributeEventsReader_17326(),
-                'replay.message.events': MessageEventsReader(),
-                'replay.game.events': GameEventsReader_16561(),
-            }
-
-        self.set4 = {
-                'replay.initData': InitDataReader(),
-                'replay.details': DetailsReader(),
-                'replay.attributes.events': AttributeEventsReader_17326(),
-                'replay.message.events': MessageEventsReader(),
-                'replay.game.events': GameEventsReader_18574(),
-        }
-
-        self.set5 = {
-                'replay.initData': InitDataReader(),
-                'replay.details': DetailsReader(),
-                'replay.attributes.events': AttributeEventsReader_17326(),
-                'replay.message.events': MessageEventsReader(),
-                'replay.game.events': GameEventsReader_19595(),
-        }
-
-        # 1.0.0-3
-        for key in (16117,16195,16223,16291):
-            self[key] = self.set1
-
-        # 1.1.0-3
-        for key in (16561,16605,16755,16939):
-            self[key] = self.set2
-
-        # 1.2.0-1.3.2
-        for key in (17326,17682,17811,18092,18221,18317):
-            self[key] = self.set3
-
-        # 1.3.3-1.3.6
-        for key in (18574,18701,19132,19269):
-            self[key] = self.set4
-
-        # 1.4beta, 1.4.0
-        for key in (19595,19679):
-            self[key] = self.set5
-
-    def __getitem__(self,key):
-        try:
-            return super(ReaderMap,self).__getitem__(key)
-        # Keep using the latest dict for all newer replay versions
-        except KeyError:
-            return self.set5
-
-readers = ReaderMap()
+readers = RangeMap()
+readers.add_range(0, 16561, {
+        'replay.initData': InitDataReader(),
+        'replay.details': DetailsReader(),
+        'replay.attributes.events': AttributeEventsReader(),
+        'replay.message.events': MessageEventsReader(),
+        'replay.game.events': GameEventsReader(),
+    })
+
+readers.add_range(16561, 17326, {
+        'replay.initData': InitDataReader(),
+        'replay.details': DetailsReader(),
+        'replay.attributes.events': AttributeEventsReader(),
+        'replay.message.events': MessageEventsReader(),
+        'replay.game.events': GameEventsReader_16561(),
+    })
+
+readers.add_range(17326, 18574, {
+        'replay.initData': InitDataReader(),
+        'replay.details': DetailsReader(),
+        'replay.attributes.events': AttributeEventsReader_17326(),
+        'replay.message.events': MessageEventsReader(),
+        'replay.game.events': GameEventsReader_16561(),
+    })
+
+readers.add_range(18574, 19595, {
+        'replay.initData': InitDataReader(),
+        'replay.details': DetailsReader(),
+        'replay.attributes.events': AttributeEventsReader_17326(),
+        'replay.message.events': MessageEventsReader(),
+        'replay.game.events': GameEventsReader_18574(),
+    })
+
+readers.add_range(19595, None, {
+        'replay.initData': InitDataReader(),
+        'replay.details': DetailsReader(),
+        'replay.attributes.events': AttributeEventsReader_17326(),
+        'replay.message.events': MessageEventsReader(),
+        'replay.game.events': GameEventsReader_19595(),
+    })

sc2reader/utils.py

@@ -592,6 +592,23 @@ def __str__(self):
         else:
             return "{0:0>2}.{1:0>2}".format(self.mins,self.secs)
 
+class RangeMap(dict):
+    def add_range(self, start, end, reader_set):
+        self.ranges.append((start, end, reader_set))
+
+    def __init__(self):
+        self.ranges = list()
+
+    def __getitem__(self,key):
+        for start, end, range_set in self.ranges:
+            if end:
+                if (start <= key < end):
+                    return range_set
+            else:
+                if start <= key:
+                    return range_set
+        raise KeyError(key)
+
 class Formatter(argparse.RawTextHelpFormatter):
     """FlexiFormatter which respects new line formatting and wraps the rest