check if None

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 55fea3cbaa11c7753e2c781f19ab06f22b38148c..828a51710a6cbfccd740274e88f9969ba7b0fee4 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,14 +1,23 @@
 import json
+import re
 import os
 import os.path
 
+from .db import *
+
+db = RainbowDB()
+
 # Regular expression for comments
 comment_re = re.compile(
     '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
     re.DOTALL | re.MULTILINE
 )
 
+
 def load_config(filepath):
+    """
+    Load config from filepath
+    """
     try:
         with open(filepath) as f:
             content = ''.join(f.readlines())
@@ -16,14 +25,26 @@ def load_config(filepath):
             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
+        db.theme_store('user')
+        return json.loads(content)
+    except IOError:
+        db.theme_store('default')
+        return None
 
-# Load colorset
+# Load default colorset
+c = {}
 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)
+data = load_config(default_config)
+if data:
+    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)
+if data:
+    for d in data:
+        c[d] = data[d]