autopep8

[rainbowstream.git] / rainbowstream / draw.py

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index bddc524aae539204ebe025345f54ad1f8f0d541a..9a8fbdd041c77110f21d64e097170e23f28ba35b 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -21,7 +21,9 @@ def color_func(func_name):
     Call color function base on name
     """
     pure = func_name.encode('utf8')
-    return locals()[pure]
+    if pure.startswith('RGB_') and pure[4:].isdigit():
+        return RGB(int(pure[4:]))
+    return globals()[pure]
 
 
 def draw(t, iot=False, keyword=None, fil=[], ig=[]):
@@ -76,10 +78,12 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     rid = res[0].rainbow_id
 
     # Format info
-    user = cycle_color(name) + color_func(TWEET['nick'])(' ' + screen_name + ' ')
-    meta = color_func(TWEET['clock'])('[' + clock + '] ') + color_func(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(TWEET['favorite'])(u'\u2605')
+        meta = meta + color_func(c['TWEET']['favorite'])(u'\u2605')
     tweet = text.split()
     # Replace url
     if expanded_url:
@@ -88,15 +92,22 @@ 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(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(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(
-            lambda x: color_func(TWEET['keyword'])(x) if
+            lambda x: color_func(c['TWEET']['keyword'])(x) if
             ''.join(c for c in x if c.isalnum()).lower() == keyword.lower()
             else x,
             tweet
@@ -149,10 +160,17 @@ def print_message(m):
     rid = res[0].rainbow_id
 
     # Draw
-    sender = cycle_color(sender_name) + color_func(MESSAGE['sender'])(' ' + sender_screen_name + ' ')
-    recipient = cycle_color(recipient_name) + color_func(MESSAGE['recipient'])(' ' + recipient_screen_name + ' ')
-    user = sender + color_func(MESSAGE['to'])(' >>> ') + recipient
-    meta = color_func(MESSAGE['clock'])('[' + clock + ']') + color_func(MESSAGE['id'])(' [message_id=' + str(rid) + '] ')
+    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) + '] ')
     text = ''.join(map(lambda x: x + '  ' if x == '\n' else x, text))
 
     line1 = u"{u:>{uw}}:".format(
@@ -189,21 +207,32 @@ def show_profile(u, iot=False):
     followers_count = u['followers_count']
 
     # Create content
-    statuses_count = color_func(PROFILE['statuses_count'])(str(statuses_count) + ' tweets')
-    friends_count = color_func(PROFILE['friends_count'])(str(friends_count) + ' following')
-    followers_count = color_func(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(PROFILE['nick']()' @' + screen_name + ' : ') + count
-    profile_image_raw_url = 'Profile photo: ' + color_func(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(PROFILE['description'])(description)
-    location = 'Location : ' + color_func(PROFILE['location'])(location)
-    url = 'URL : ' + (color_func(PROFILE['url'])(url) if url else '')
+    description = color_func(c['PROFILE']['description'])(description)
+    location = 'Location : ' + color_func(c['PROFILE']['location'])(location)
+    url = 'URL : ' + (color_func(c['PROFILE']['url'])(url) if url else '')
     date = parser.parse(created_at)
     date = date - datetime.timedelta(seconds=time.timezone)
     clock = date.strftime('%Y/%m/%d %H:%M:%S')
-    clock = 'Join at ' + color_func(PROFILE['clock'])(clock)
+    clock = 'Join at ' + color_func(c['PROFILE']['clock'])(clock)
 
     # Format
     line1 = u"{u:>{uw}}".format(
@@ -248,10 +277,9 @@ def print_trends(trends):
     """
     Display topics
     """
-    for topic in trends[:TREND_MAX]:
+    for topic in trends[:c['TREND_MAX']]:
         name = topic['name']
         url = topic['url']
-        line = cycle_color(name) + ': ' + TREND['url'](url)
+        line = cycle_color(name) + ': ' + color_func(TREND['url'])(url)
         printNicely(line)
     printNicely('')
-