check config and little refactoring

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 837aec0d4c19a59076ff3b0ff3947aeaff29c1eb..ff2d17df7e51db45591898f5ca442f46d5e853de 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,48 +1,59 @@
-from .colors import *
 import json
+import re
 import os
 import os.path
-
-# '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
-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'
+from collections import OrderedDict
+
+# Regular expression for comments
+comment_re = re.compile(
+    '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
+    re.DOTALL | re.MULTILINE
+)
+
+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, object_pairs_hook=OrderedDict)
+
+# Config dictionary
+c = {}
+
+# Load the initial config
+config = os.path.dirname(
+    __file__) + '/colorset/config'
 try:
-    if os.path.exists(rainbow_config):
-        data = json.load(open(rainbow_config))
-        for d in data:
-            locals()[d] = data[d]
+    data = load_config(config)
+    for d in data:
+        c[d] = data[d]
 except:
     pass
 
+# Load user's config
+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]
+except:
+    print('It seems that ~/.rainbow_config.json has wrong format :(')
 
+# Load default theme
+theme_file = os.path.dirname(
+    __file__) + '/colorset/' + c['THEME'] + '.json'
+try:
+    data = load_config(theme_file)
+    for d in data:
+        c[d] = data[d]
+except:
+    pass