seperate draw module

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
new file mode 100644 (file)
index 0000000..702ca1d
--- /dev/null
+++ b/rainbowstream/draw.py
@@ -0,0 +1,243 @@
+"""
+Draw
+"""
+import requests
+import datetime
+import time
+
+from StringIO import StringIO
+from dateutil import parser
+from .colors import *
+from .config import *
+from .db import *
+
+db = RainbowDB()
+
+def draw(t, iot=False, keyword=None, fil=[], ig=[]):
+    """
+    Draw the rainbow
+    """
+
+    # Retrieve tweet
+    tid = t['id']
+    text = t['text']
+    screen_name = t['user']['screen_name']
+    name = t['user']['name']
+    created_at = t['created_at']
+    favorited = t['favorited']
+    date = parser.parse(created_at)
+    date = date - datetime.timedelta(seconds=time.timezone)
+    clock = date.strftime('%Y/%m/%d %H:%M:%S')
+
+    # Get expanded url
+    try:
+        expanded_url = []
+        url = []
+        urls = t['entities']['urls']
+        for u in urls:
+            expanded_url.append(u['expanded_url'])
+            url.append(u['url'])
+    except:
+        expanded_url = None
+        url = None
+
+    # Get media
+    try:
+        media_url = []
+        media = t['entities']['media']
+        for m in media:
+            media_url.append(m['media_url'])
+    except:
+        media_url = None
+
+    # Filter and ignore
+    screen_name = '@' + screen_name
+    if fil and screen_name not in fil:
+        return
+    if ig and screen_name in ig:
+        return
+
+    # Get rainbow id
+    res = db.tweet_to_rainbow_query(tid)
+    if not res:
+        db.tweet_store(tid)
+        res = db.tweet_to_rainbow_query(tid)
+    rid = res[0].rainbow_id
+
+    # Format info
+    user = cycle_color(name) + grey(' ' + screen_name + ' ')
+    meta = grey('[' + clock + '] [id=' + str(rid) + '] ')
+    if favorited:
+        meta = meta + green(u'\u2605')
+    tweet = text.split()
+    # Replace url
+    if expanded_url:
+        for index in range(len(expanded_url)):
+            tweet = map(
+                lambda x: expanded_url[index] if x == url[index] else x,
+                tweet)
+    # Highlight RT
+    tweet = map(lambda x: grey(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: cyan(x) if x[0:4] == 'http' else x, tweet)
+    # Highlight search keyword
+    if keyword:
+        tweet = map(
+            lambda x: on_yellow(x) if
+            ''.join(c for c in x if c.isalnum()).lower() == keyword.lower()
+            else x,
+            tweet
+        )
+    # Recreate tweet
+    tweet = ' '.join(tweet)
+
+    # Draw rainbow
+    line1 = u"{u:>{uw}}:".format(
+        u=user,
+        uw=len(user) + 2,
+    )
+    line2 = u"{c:>{cw}}".format(
+        c=meta,
+        cw=len(meta) + 2,
+    )
+    line3 = '  ' + tweet
+
+    printNicely('')
+    printNicely(line1)
+    printNicely(line2)
+    printNicely(line3)
+
+    # Display Image
+    if iot and media_url:
+        for mu in media_url:
+            response = requests.get(mu)
+            image_to_display(StringIO(response.content))
+
+
+def print_message(m):
+    """
+    Print direct message
+    """
+    sender_screen_name = '@' + m['sender_screen_name']
+    sender_name = m['sender']['name']
+    text = m['text']
+    recipient_screen_name = '@' + m['recipient_screen_name']
+    recipient_name = m['recipient']['name']
+    mid = m['id']
+    date = parser.parse(m['created_at'])
+    date = date - datetime.timedelta(seconds=time.timezone)
+    clock = date.strftime('%Y/%m/%d %H:%M:%S')
+
+    # Get rainbow id
+    res = db.message_to_rainbow_query(mid)
+    if not res:
+        db.message_store(mid)
+        res = db.message_to_rainbow_query(mid)
+    rid = res[0].rainbow_id
+
+    sender = cycle_color(sender_name) + grey(' ' + sender_screen_name + ' ')
+    recipient = cycle_color(
+        recipient_name) + grey(' ' + recipient_screen_name + ' ')
+    user = sender + magenta(' >>> ') + recipient
+    meta = grey('[' + clock + '] [message_id=' + str(rid) + '] ')
+    text = ''.join(map(lambda x: x + '  ' if x == '\n' else x, text))
+
+    line1 = u"{u:>{uw}}:".format(
+        u=user,
+        uw=len(user) + 2,
+    )
+    line2 = u"{c:>{cw}}".format(
+        c=meta,
+        cw=len(meta) + 2,
+    )
+
+    line3 = '  ' + text
+
+    printNicely('')
+    printNicely(line1)
+    printNicely(line2)
+    printNicely(line3)
+
+
+def show_profile(u, iot=False):
+    """
+    Show a profile
+    """
+    # Retrieve info
+    name = u['name']
+    screen_name = u['screen_name']
+    description = u['description']
+    profile_image_url = u['profile_image_url']
+    location = u['location']
+    url = u['url']
+    created_at = u['created_at']
+    statuses_count = u['statuses_count']
+    friends_count = u['friends_count']
+    followers_count = u['followers_count']
+    # Create content
+    statuses_count = green(str(statuses_count) + ' tweets')
+    friends_count = green(str(friends_count) + ' following')
+    followers_count = green(str(followers_count) + ' followers')
+    count = statuses_count + '  ' + friends_count + '  ' + followers_count
+    user = cycle_color(name) + grey(' @' + screen_name + ' : ') + count
+    profile_image_raw_url = 'Profile photo: ' + cyan(profile_image_url)
+    description = ''.join(
+        map(lambda x: x + ' ' * 4 if x == '\n' else x, description))
+    description = yellow(description)
+    location = 'Location : ' + magenta(location)
+    url = 'URL : ' + (cyan(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 ' + white(clock)
+    # Format
+    line1 = u"{u:>{uw}}".format(
+        u=user,
+        uw=len(user) + 2,
+    )
+    line2 = u"{p:>{pw}}".format(
+        p=profile_image_raw_url,
+        pw=len(profile_image_raw_url) + 4,
+    )
+    line3 = u"{d:>{dw}}".format(
+        d=description,
+        dw=len(description) + 4,
+    )
+    line4 = u"{l:>{lw}}".format(
+        l=location,
+        lw=len(location) + 4,
+    )
+    line5 = u"{u:>{uw}}".format(
+        u=url,
+        uw=len(url) + 4,
+    )
+    line6 = u"{c:>{cw}}".format(
+        c=clock,
+        cw=len(clock) + 4,
+    )
+    # Display
+    printNicely('')
+    printNicely(line1)
+    if iot:
+        response = requests.get(profile_image_url)
+        image_to_display(StringIO(response.content), 2, 20)
+    else:
+        printNicely(line2)
+    for line in [line3, line4, line5, line6]:
+        printNicely(line)
+    printNicely('')
+
+
+def print_trends(trends):
+    """
+    Display topics
+    """
+    for topic in trends[:TREND_MAX]:
+        name = topic['name']
+        url = topic['url']
+        line = cycle_color(name) + ': ' + cyan(url)
+        printNicely(line)
+    printNicely('')
+

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 8fb8a5843a9809c056e308b397df87e4ab348ea7..91c115cdce61f2279242b4dac35dd873083e0845 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -20,6 +20,7 @@ from twitter.oauth_dance import oauth_dance
 from twitter.util import printNicely
 from StringIO import StringIO
 
+from .draw import *
 from .colors import *
 from .config import *
 from .consumer import *
@@ -64,236 +65,6 @@ cmdset = [
     'q'
 ]
 
-
-def draw(t, iot=False, keyword=None, fil=[], ig=[]):
-    """
-    Draw the rainbow
-    """
-
-    # Retrieve tweet
-    tid = t['id']
-    text = t['text']
-    screen_name = t['user']['screen_name']
-    name = t['user']['name']
-    created_at = t['created_at']
-    favorited = t['favorited']
-    date = parser.parse(created_at)
-    date = date - datetime.timedelta(seconds=time.timezone)
-    clock = date.strftime('%Y/%m/%d %H:%M:%S')
-
-    # Get expanded url
-    try:
-        expanded_url = []
-        url = []
-        urls = t['entities']['urls']
-        for u in urls:
-            expanded_url.append(u['expanded_url'])
-            url.append(u['url'])
-    except:
-        expanded_url = None
-        url = None
-
-    # Get media
-    try:
-        media_url = []
-        media = t['entities']['media']
-        for m in media:
-            media_url.append(m['media_url'])
-    except:
-        media_url = None
-
-    # Filter and ignore
-    screen_name = '@' + screen_name
-    if fil and screen_name not in fil:
-        return
-    if ig and screen_name in ig:
-        return
-
-    # Get rainbow id
-    res = db.tweet_to_rainbow_query(tid)
-    if not res:
-        db.tweet_store(tid)
-        res = db.tweet_to_rainbow_query(tid)
-    rid = res[0].rainbow_id
-
-    # Format info
-    user = cycle_color(name) + grey(' ' + screen_name + ' ')
-    meta = grey('[' + clock + '] [id=' + str(rid) + '] ')
-    if favorited:
-        meta = meta + green(u'\u2605')
-    tweet = text.split()
-    # Replace url
-    if expanded_url:
-        for index in range(len(expanded_url)):
-            tweet = map(
-                lambda x: expanded_url[index] if x == url[index] else x,
-                tweet)
-    # Highlight RT
-    tweet = map(lambda x: grey(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: cyan(x) if x[0:4] == 'http' else x, tweet)
-    # Highlight search keyword
-    if keyword:
-        tweet = map(
-            lambda x: on_yellow(x) if
-            ''.join(c for c in x if c.isalnum()).lower() == keyword.lower()
-            else x,
-            tweet
-        )
-    # Recreate tweet
-    tweet = ' '.join(tweet)
-
-    # Draw rainbow
-    line1 = u"{u:>{uw}}:".format(
-        u=user,
-        uw=len(user) + 2,
-    )
-    line2 = u"{c:>{cw}}".format(
-        c=meta,
-        cw=len(meta) + 2,
-    )
-    line3 = '  ' + tweet
-
-    printNicely('')
-    printNicely(line1)
-    printNicely(line2)
-    printNicely(line3)
-
-    # Display Image
-    if iot and media_url:
-        for mu in media_url:
-            response = requests.get(mu)
-            image_to_display(StringIO(response.content))
-
-
-def print_message(m):
-    """
-    Print direct message
-    """
-    sender_screen_name = '@' + m['sender_screen_name']
-    sender_name = m['sender']['name']
-    text = m['text']
-    recipient_screen_name = '@' + m['recipient_screen_name']
-    recipient_name = m['recipient']['name']
-    mid = m['id']
-    date = parser.parse(m['created_at'])
-    date = date - datetime.timedelta(seconds=time.timezone)
-    clock = date.strftime('%Y/%m/%d %H:%M:%S')
-
-    # Get rainbow id
-    res = db.message_to_rainbow_query(mid)
-    if not res:
-        db.message_store(mid)
-        res = db.message_to_rainbow_query(mid)
-    rid = res[0].rainbow_id
-
-    sender = cycle_color(sender_name) + grey(' ' + sender_screen_name + ' ')
-    recipient = cycle_color(
-        recipient_name) + grey(' ' + recipient_screen_name + ' ')
-    user = sender + magenta(' >>> ') + recipient
-    meta = grey('[' + clock + '] [message_id=' + str(rid) + '] ')
-    text = ''.join(map(lambda x: x + '  ' if x == '\n' else x, text))
-
-    line1 = u"{u:>{uw}}:".format(
-        u=user,
-        uw=len(user) + 2,
-    )
-    line2 = u"{c:>{cw}}".format(
-        c=meta,
-        cw=len(meta) + 2,
-    )
-
-    line3 = '  ' + text
-
-    printNicely('')
-    printNicely(line1)
-    printNicely(line2)
-    printNicely(line3)
-
-
-def show_profile(u):
-    """
-    Show a profile
-    """
-    # Retrieve info
-    name = u['name']
-    screen_name = u['screen_name']
-    description = u['description']
-    profile_image_url = u['profile_image_url']
-    location = u['location']
-    url = u['url']
-    created_at = u['created_at']
-    statuses_count = u['statuses_count']
-    friends_count = u['friends_count']
-    followers_count = u['followers_count']
-    # Create content
-    statuses_count = green(str(statuses_count) + ' tweets')
-    friends_count = green(str(friends_count) + ' following')
-    followers_count = green(str(followers_count) + ' followers')
-    count = statuses_count + '  ' + friends_count + '  ' + followers_count
-    user = cycle_color(name) + grey(' @' + screen_name + ' : ') + count
-    profile_image_raw_url = 'Profile photo: ' + cyan(profile_image_url)
-    description = ''.join(
-        map(lambda x: x + ' ' * 4 if x == '\n' else x, description))
-    description = yellow(description)
-    location = 'Location : ' + magenta(location)
-    url = 'URL : ' + (cyan(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 ' + white(clock)
-    # Format
-    line1 = u"{u:>{uw}}".format(
-        u=user,
-        uw=len(user) + 2,
-    )
-    line2 = u"{p:>{pw}}".format(
-        p=profile_image_raw_url,
-        pw=len(profile_image_raw_url) + 4,
-    )
-    line3 = u"{d:>{dw}}".format(
-        d=description,
-        dw=len(description) + 4,
-    )
-    line4 = u"{l:>{lw}}".format(
-        l=location,
-        lw=len(location) + 4,
-    )
-    line5 = u"{u:>{uw}}".format(
-        u=url,
-        uw=len(url) + 4,
-    )
-    line6 = u"{c:>{cw}}".format(
-        c=clock,
-        cw=len(clock) + 4,
-    )
-    # Display
-    printNicely('')
-    printNicely(line1)
-    if g['iot']:
-        response = requests.get(profile_image_url)
-        image_to_display(StringIO(response.content), 2, 20)
-    else:
-        printNicely(line2)
-    for line in [line3, line4, line5, line6]:
-        printNicely(line)
-    printNicely('')
-
-
-def print_trends(trends):
-    """
-    Display topics
-    """
-    for topic in trends[:TREND_MAX]:
-        name = topic['name']
-        url = topic['url']
-        line = cycle_color(name) + ': ' + cyan(url)
-        printNicely(line)
-    printNicely('')
-
-
 def parse_arguments():
     """
     Parse the arguments
@@ -819,7 +590,7 @@ def whois():
             user = t.users.show(
                 screen_name=screen_name[1:],
                 include_entities=False)
-            show_profile(user)
+            show_profile(user, g['iot'])
         except:
             printNicely(red('Omg no user.'))
     else: