X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fconfig.py;h=ff2d17df7e51db45591898f5ca442f46d5e853de;hp=e2937ca329dceeeab2e4b6e7fc6fbf89aaa89f19;hb=8b8566d13f923932bee8eec9487d35956797b796;hpb=72c02928f45228d75ff391394800355ecd65e94e

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index e2937ca..ff2d17d 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -2,7 +2,7 @@ import json
 import re
 import os
 import os.path
-from twitter.util import printNicely
+from collections import OrderedDict
 
 # Regular expression for comments
 comment_re = re.compile(
@@ -11,27 +11,49 @@ comment_re = re.compile(
 )
 
 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, object_pairs_hook=OrderedDict)
 
-DOMAIN = USER_DOMAIN
+# Config dictionary
+c = {}
 
-# Image config
-IMAGE_SHIFT = 10
-IMAGE_MAX_HEIGHT = 40
+# 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 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)
+# 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:
+    print('It seems that ~/.rainbow_config.json has wrong format :(')
+
+# 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