list fully supported and autopep8

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 183bfe35e84c2b9a604c5847fc2ca81b22b24505..b17a0e2f46734a9a91cb28c2d1d580bffcfe2de1 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -3,10 +3,6 @@ import re
 import os
 import os.path
 
 import os
 import os.path
 

-from .db import *
-
-db = RainbowDB()
-

 # Regular expression for comments
 comment_re = re.compile(
     '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
 # Regular expression for comments
 comment_re = re.compile(
     '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',


@@ -26,13 +22,31 @@ def load_config(filepath):
             match = comment_re.search(content)
     return json.loads(content)
 
             match = comment_re.search(content)
     return json.loads(content)
 

-# Load default colorset
+# Config dictionary

 c = {}
 c = {}

-default_config = 'rainbowstream/colorset/default.json'
+# Load default
+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'
 data = load_config(default_config)
 for d in data:
     c[d] = data[d]
 c['theme'] = 'default'

+# Load init if exist
+try:
+    path = os.path.dirname(__file__) + '/colorset/init'
+    f = open(path)
+    lines = f.readlines()
+    if len(lines) > 1:
+        raise Exception('More than 1 default theme')
+    theme_name = lines[0].strip()
+    default_config = os.path.dirname(
+        __file__) + '/colorset/' + theme_name + '.json'
+    data = load_config(default_config)
+    for d in data:
+        c[d] = data[d]
+    c['theme'] = theme_name
+    f.close()
+except:
+    pass

 # Load user's colorset
 rainbow_config = os.environ.get(
     'HOME',
 # Load user's colorset
 rainbow_config = os.environ.get(
     'HOME',