add option to ascii art and default config load

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 3f61553d393eea03d72f757fdffaa88e09ca17bf..6aad12c1a91785b994a24a447c56d5aaf8aae109 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -2,6 +2,7 @@ import json
 import re
 import os
 import os.path
+from collections import OrderedDict
 
 # Regular expression for comments
 comment_re = re.compile(
@@ -13,25 +14,46 @@ def load_config(filepath):
     """
     Load config from filepath
     """
-    try:
-        with open(filepath) as f:
-            content = ''.join(f.readlines())
+    with open(filepath) as f:
+        content = ''.join(f.readlines())
+        match = comment_re.search(content)
+        while match:
+            content = content[:match.start()] + content[match.end():]
             match = comment_re.search(content)
-            while match:
-                content = content[:match.start()] + content[match.end():]
-                match = comment_re.search(content)
-        return json.loads(content)
-    except:
-        pass
+    return json.loads(content, object_pairs_hook=OrderedDict)
 
-# Load default colorset
+# Config dictionary
 c = {}
-default_config = 'rainbowstream/colorset/default.json'
-data = load_config(default_config)
-for d in data:
-    c[d] = data[d]
-# Load user's colorset
-rainbow_config = os.environ.get('HOME', os.environ.get('USERPROFILE','')) + os.sep + '.rainbow_config.json'
-data = load_config(rainbow_config)
-for d in data:
-    c[d] = data[d]
+
+# Load the initial config
+config = os.path.dirname(
+    __file__) + '/colorset/config'
+try:
+    data = load_config(config)
+    for d in data:
+        c[d] = data[d]
+except:
+    pass
+
+# Load user's config
+rainbow_config = os.environ.get(
+    'HOME',
+    os.environ.get(
+        'USERPROFILE',
+        '')) + os.sep + '.rainbow_config.json'
+try:
+    data = load_config(rainbow_config)
+    for d in data:
+        c[d] = data[d]
+except:
+    pass
+
+# Load default theme
+theme_file = os.path.dirname(
+    __file__) + '/colorset/' + c['THEME'] + '.json'
+try:
+    data = load_config(theme_file)
+    for d in data:
+        c[d] = data[d]
+except:
+    pass