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

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 24306de..a5e542d 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,19 +1,45 @@
-# Max Search record
-SEARCH_MAX_RECORD = 5
-# Default home tweet
-HOME_TWEET_NUM = 5
+import json
+import re
+import os
+import os.path
 
-# Stream Domain
-USER_DOMAIN = 'userstream.twitter.com'
-PUBLIC_DOMAIN = 'stream.twitter.com'
-SITE_DOMAIN = 'sitestream.twitter.com'
-# Actually called
-DOMAIN = USER_DOMAIN
 
-# Filter and Ignore list ex: ['@fat','@mdo']
-ONLY_LIST = []
-IGNORE_LIST = []
+# Regular expression for comments
+comment_re = re.compile(
+    '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
+    re.DOTALL | re.MULTILINE
+)
 
-# Image size
-IMAGE_SHIFT = 10
-IMAGE_MAX_HEIGHT = 30
\ No newline at end of file
+
+def load_config(filepath):
+    """
+    Load config from filepath
+    """
+    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)
+    return json.loads(content)
+
+# Load default colorset
+c = {}
+default_config = 'rainbowstream/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'
+try:
+    data = load_config(rainbow_config)
+    for d in data:
+        c[d] = data[d]
+    c['theme'] = 'custom'
+except:
+    pass