X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fconfig.py;h=de49969846a83d7712b02c192de2b37057bd684e;hp=af03a1b144d8146516ace13c9b2e67eb09c68469;hb=92be926e9093ad23c463ba39c94047d883e779be;hpb=f5677fb1d3a9e2aa06971500b2c244dcdbe43a3f

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index af03a1b..de49969 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,21 +1,34 @@
-# Max Search record
-SEARCH_MAX_RECORD = 5
-# Default home tweet
-HOME_TWEET_NUM = 5
-# Autocomplete history
-HISTORY_FILENAME = 'completer.hist'
+import json
+import re
+import os
+import os.path
+from twitter.util import printNicely
 
-# Stream Domain
-USER_DOMAIN = 'userstream.twitter.com'
-PUBLIC_DOMAIN = 'stream.twitter.com'
-SITE_DOMAIN = 'sitestream.twitter.com'
-# Actually called
-DOMAIN = USER_DOMAIN
+# Regular expression for comments
+comment_re = re.compile(
+    '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
+    re.DOTALL | re.MULTILINE
+)
 
-# Filter and Ignore list ex: ['@fat','@mdo']
-ONLY_LIST = []
-IGNORE_LIST = []
+def load_config(filepath):
+    """
+    Load config from filepath
+    """
+    try:
+        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)
+        data = json.loads(content)
+        for d in data:
+            globals()[d] = data[d]
+    except:
+        pass
 
-# Image shift and size
-IMAGE_SHIFT = 10
-IMAGE_MAX_HEIGHT = 300
\ No newline at end of file
+# Load colorset
+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)