X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fconfig.py;h=b17a0e2f46734a9a91cb28c2d1d580bffcfe2de1;hp=55fea3cbaa11c7753e2c781f19ab06f22b38148c;hb=422dd3858dacc83de5e9d053140341b62a44012b;hpb=0a0ee6dbc4993c1c9d21c101f7df53517af120e4

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 55fea3c..b17a0e2 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,4 +1,5 @@
 import json
+import re
 import os
 import os.path
 
@@ -8,22 +9,54 @@ comment_re = re.compile(
     re.DOTALL | re.MULTILINE
 )
 
+
 def load_config(filepath):
-    try:
-        with open(filepath) as f:
-            content = ''.join(f.readlines())
+    """
+    Load config from filepath
+    """
+    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)
-        data = json.loads(content)
-        for d in data:
-            globals()[d] = data[d]
-    except:
-        pass
+    return json.loads(content)
 
-# Load colorset
-default_config = 'rainbowstream/colorset/default.json'
-rainbow_config = os.environ.get('HOME', os.environ.get('USERPROFILE','')) + os.sep + '.rainbow_config.json'
-load_config(default_config)
-load_config(rainbow_config)
+# Config dictionary
+c = {}
+# Load default
+default_config = os.path.dirname(__file__) + '/colorset/default.json'
+data = load_config(default_config)
+for d in data:
+    c[d] = data[d]
+c['theme'] = 'default'
+# Load init if exist
+try:
+    path = os.path.dirname(__file__) + '/colorset/init'
+    f = open(path)
+    lines = f.readlines()
+    if len(lines) > 1:
+        raise Exception('More than 1 default theme')
+    theme_name = lines[0].strip()
+    default_config = os.path.dirname(
+        __file__) + '/colorset/' + theme_name + '.json'
+    data = load_config(default_config)
+    for d in data:
+        c[d] = data[d]
+    c['theme'] = theme_name
+    f.close()
+except:
+    pass
+# Load user's colorset
+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]
+    c['theme'] = 'custom'
+except:
+    pass