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

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 828a517..a5e542d 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -3,9 +3,6 @@ import re
 import os
 import os.path
 
-from .db import *
-
-db = RainbowDB()
 
 # Regular expression for comments
 comment_re = re.compile(
@@ -18,33 +15,31 @@ 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)
 
 # Load default colorset
 c = {}
 default_config = 'rainbowstream/colorset/default.json'
 data = load_config(default_config)
-if data:
-    for d in data:
-        c[d] = data[d]
+for d in data:
+    c[d] = data[d]
+c['theme'] = 'default'
 # 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:
+try:
+    data = load_config(rainbow_config)
     for d in data:
         c[d] = data[d]
+    c['theme'] = 'custom'
+except:
+    pass