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

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 828a517..ff2d17d 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -2,10 +2,7 @@ import json
 import re
 import os
 import os.path
-
-from .db import *
-
-db = RainbowDB()
+from collections import OrderedDict
 
 # Regular expression for comments
 comment_re = re.compile(
@@ -13,38 +10,50 @@ comment_re = re.compile(
     re.DOTALL | re.MULTILINE
 )
 
-
 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)
-        db.theme_store('user')
-        return json.loads(content)
-    except IOError:
-        db.theme_store('default')
-        return None
+    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)
-if data:
+
+# Load the initial config
+config = os.path.dirname(
+    __file__) + '/colorset/config'
+try:
+    data = load_config(config)
     for d in data:
         c[d] = data[d]
-# Load user's colorset
+except:
+    pass
+
+# Load user's config
 rainbow_config = os.environ.get(
     'HOME',
     os.environ.get(
         'USERPROFILE',
         '')) + os.sep + '.rainbow_config.json'
-data = load_config(rainbow_config)
-if data:
+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