fix -iot bug

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 418afbb0a03411a1a563cdb5d479c4c5c43c4215..bc541a9297570e6f38a03dd9da4e1241ca4b98ad 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -3,6 +3,7 @@ import re
 import os
 import os.path
 
+
 # Regular expression for comments
 comment_re = re.compile(
     '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
@@ -14,29 +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)
-        return json.loads(content)
-    except:
-        pass
+    return json.loads(content)
 
 # Load default colorset
 c = {}
-default_config = 'rainbowstream/colorset/default.json'
+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 user's colorset
 rainbow_config = os.environ.get(
     'HOME',
     os.environ.get(
         'USERPROFILE',
         '')) + os.sep + '.rainbow_config.json'
-data = load_config(rainbow_config)
-for d in data:
-    c[d] = data[d]
+try:
+    data = load_config(rainbow_config)
+    for d in data:
+        c[d] = data[d]
+    c['theme'] = 'custom'
+except:
+    pass