X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fdraw.py;h=148fc5884456378dfa81f376f6e8bec921510f39;hp=b35649c2393c66b6614cf8fc985ba07b6a187d31;hb=f75930c6e0b0ec505732b758d414162a8bebdece;hpb=632c6fa515fe36cf88ef2bf39378464bd24701d8;ds=sidebyside

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index b35649c..148fc58 100644
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -15,12 +15,34 @@ from .db import *
 
 db = RainbowDB()
 
+def check_theme():
+    """
+    Check current theme and update if necessary
+    """
+    exists = db.theme_query()
+    themes = [t.theme_name for t in exists]
+    if c['theme'] != themes[0]:
+        c['theme'] = themes[0]
+        # Determine path
+        if c['theme'] == 'custom':
+            config = os.environ.get(
+                'HOME',
+                os.environ.get(
+                'USERPROFILE',
+                '')) + os.sep + '.rainbow_config.json'
+        else:
+            config = 'rainbowstream/colorset/'+c['theme']+'.json'
+        # Load new config
+        data = load_config(config)
+        if data:
+            for d in data:
+                c[d] = data[d]
+
 
 def color_func(func_name):
     """
     Call color function base on name
     """
-    print globals()['TWEET']
     pure = func_name.encode('utf8')
     if pure.startswith('RGB_') and pure[4:].isdigit():
         return RGB(int(pure[4:]))
@@ -32,6 +54,7 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     Draw the rainbow
     """
 
+    check_theme()
     # Retrieve tweet
     tid = t['id']
     text = t['text']
@@ -79,8 +102,10 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     rid = res[0].rainbow_id
 
     # Format info
-    user = cycle_color(name) + color_func(c['TWEET']['nick'])(' ' + screen_name + ' ')
-    meta = color_func(c['TWEET']['clock'])('[' + clock + '] ') + color_func(c['TWEET']['id'])('[id=' + str(rid) + '] ')
+    user = cycle_color(
+        name) + color_func(c['TWEET']['nick'])(' ' + screen_name + ' ')
+    meta = color_func(c['TWEET']['clock'])(
+        '[' + clock + '] ') + color_func(c['TWEET']['id'])('[id=' + str(rid) + '] ')
     if favorited:
         meta = meta + color_func(c['TWEET']['favorite'])(u'\u2605')
     tweet = text.split()
@@ -91,11 +116,18 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
                 lambda x: expanded_url[index] if x == url[index] else x,
                 tweet)
     # Highlight RT
-    tweet = map(lambda x: color_func(c['TWEET']['rt'])(x) if x == 'RT' else x, tweet)
+    tweet = map(
+        lambda x: color_func(
+            c['TWEET']['rt'])(x) if x == 'RT' else x,
+        tweet)
     # Highlight screen_name
     tweet = map(lambda x: cycle_color(x) if x[0] == '@' else x, tweet)
     # Highlight link
-    tweet = map(lambda x: color_func(c['TWEET']['link'])(x) if x[0:4] == 'http' else x, tweet)
+    tweet = map(
+        lambda x: color_func(
+            c['TWEET']['link'])(x) if x[
+            0:4] == 'http' else x,
+        tweet)
     # Highlight search keyword
     if keyword:
         tweet = map(
@@ -152,10 +184,17 @@ def print_message(m):
     rid = res[0].rainbow_id
 
     # Draw
-    sender = cycle_color(sender_name) + color_func(c['MESSAGE']['sender'])(' ' + sender_screen_name + ' ')
-    recipient = cycle_color(recipient_name) + color_func(c['MESSAGE']['recipient'])(' ' + recipient_screen_name + ' ')
+    sender = cycle_color(
+        sender_name) + color_func(c['MESSAGE']['sender'])(' ' + sender_screen_name + ' ')
+    recipient = cycle_color(recipient_name) + color_func(
+        c['MESSAGE']['recipient'])(
+        ' ' + recipient_screen_name + ' ')
     user = sender + color_func(c['MESSAGE']['to'])(' >>> ') + recipient
-    meta = color_func(c['MESSAGE']['clock'])('[' + clock + ']') + color_func(c['MESSAGE']['id'])(' [message_id=' + str(rid) + '] ')
+    meta = color_func(
+        c['MESSAGE']['clock'])(
+        '[' + clock + ']') + color_func(
+            c['MESSAGE']['id'])(
+                ' [message_id=' + str(rid) + '] ')
     text = ''.join(map(lambda x: x + '  ' if x == '\n' else x, text))
 
     line1 = u"{u:>{uw}}:".format(
@@ -192,12 +231,23 @@ def show_profile(u, iot=False):
     followers_count = u['followers_count']
 
     # Create content
-    statuses_count = color_func(c['PROFILE']['statuses_count'])(str(statuses_count) + ' tweets')
-    friends_count = color_func(c['PROFILE']['friends_count'])(str(friends_count) + ' following')
-    followers_count = color_func(c['PROFILE']['followers_count'])(str(followers_count) + ' followers')
+    statuses_count = color_func(
+        c['PROFILE']['statuses_count'])(
+        str(statuses_count) +
+        ' tweets')
+    friends_count = color_func(
+        c['PROFILE']['friends_count'])(
+        str(friends_count) +
+        ' following')
+    followers_count = color_func(
+        c['PROFILE']['followers_count'])(
+        str(followers_count) +
+        ' followers')
     count = statuses_count + '  ' + friends_count + '  ' + followers_count
-    user = cycle_color(name) + color_func(c['PROFILE']['nick'])(' @' + screen_name + ' : ') + count
-    profile_image_raw_url = 'Profile photo: ' + color_func(c['PROFILE']['profile_image_url'])(profile_image_url)
+    user = cycle_color(
+        name) + color_func(c['PROFILE']['nick'])(' @' + screen_name + ' : ') + count
+    profile_image_raw_url = 'Profile photo: ' + \
+        color_func(c['PROFILE']['profile_image_url'])(profile_image_url)
     description = ''.join(
         map(lambda x: x + ' ' * 4 if x == '\n' else x, description))
     description = color_func(c['PROFILE']['description'])(description)
@@ -254,7 +304,6 @@ def print_trends(trends):
     for topic in trends[:c['TREND_MAX']]:
         name = topic['name']
         url = topic['url']
-        line = cycle_color(name) + ': ' + color_func(TREND['url'])(url)
+        line = cycle_color(name) + ': ' + color_func(c['TREND']['url'])(url)
         printNicely(line)
     printNicely('')
-