stream config

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 837aec0d4c19a59076ff3b0ff3947aeaff29c1eb..e2937ca329dceeeab2e4b6e7fc6fbf89aaa89f19 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,28 +1,29 @@
-from .colors import *
 import json
+import re
 import os
 import os.path
+from twitter.util import printNicely
+
+# Regular expression for comments
+comment_re = re.compile(
+    '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
+    re.DOTALL | re.MULTILINE
+)
+
+def load_config(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
 
-# 'search': max search record
-SEARCH_MAX_RECORD = 5
-# 'home': default number of home's tweets
-HOME_TWEET_NUM = 5
-# 'allrt': default number of retweets
-RETWEETS_SHOW_NUM = 5
-# 'inbox','sent': default number of direct message
-MESSAGES_DISPLAY = 5
-# 'trend': max trending topics
-TREND_MAX = 10
-# 'switch': Filter and Ignore list ex: ['@fat','@mdo']
-ONLY_LIST = []
-IGNORE_LIST = []
-
-# Autocomplete history file name
-HISTORY_FILENAME = 'completer.hist'
-
-USER_DOMAIN = 'userstream.twitter.com'
-PUBLIC_DOMAIN = 'stream.twitter.com'
-SITE_DOMAIN = 'sitestream.twitter.com'
 DOMAIN = USER_DOMAIN
 
 # Image config
@@ -30,19 +31,7 @@ IMAGE_SHIFT = 10
 IMAGE_MAX_HEIGHT = 40
 
 # Load colorset
-COLOR_SET = ['colorset.default']
-modules = map(__import__, COLOR_SET)
-
-# Load json config
-rainbow_config = os.environ.get(
-    'HOME', os.environ.get('USERPROFILE',''))
-    + os.sep + '.rainbow_config.json'
-try:
-    if os.path.exists(rainbow_config):
-        data = json.load(open(rainbow_config))
-        for d in data:
-            locals()[d] = data[d]
-except:
-    pass
-
-
+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)