X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=cdddef2c6979c829772a0c0edd645bd7693acca2;hp=43fa026999848d1e98c720d5babc2922d6c51644;hb=8c840a8396f7d42453bad34cb31ab1c3b5c7466f;hpb=6b8ca2f5a48d041cdfcfa86eb1ffb9b7c8a2a1de

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 43fa026..cdddef2 100644
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -4,29 +4,18 @@ Colorful user's timeline stream
 
 from __future__ import print_function
 
-import os, os.path, argparse, random
+import os, os.path, argparse
 
 from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup
 from twitter.oauth import OAuth, read_token_file
+from twitter.oauth_dance import oauth_dance
 from twitter.util import printNicely
+from twitter.ansi import *
 from dateutil import parser
-from pyfiglet import figlet_format
 
 from colors import *
 from config import *
 
-def asciiart():
-    """
-    Draw the Ascii Art
-    """
-    d = [red, green, yellow, blue, magenta, cyan, white]
-    fi = figlet_format('Rainbow Stream', font='doom')
-    print('\n'.join(
-            [random.choice(d)(i) for i in fi.split('\n')]
-        )
-    )
-
-
 def draw(t):
     """
     Draw the rainbow
@@ -40,9 +29,13 @@ def draw(t):
     time = date.strftime('%Y/%m/%d %H:%M:%S')
 
     # Format info
-    user = green(name) + ' ' + yellow('@' + screen_name) + ' '
-    clock = magenta('['+ time + ']')
-    tweet = white(text)
+    user = cycle_color(name + ' ' + '@' + screen_name + ' ')
+    clock = grey('['+ time + ']')
+    tweet = text.split()
+    tweet = map(lambda x: grey(x) if x=='RT' else x, tweet)
+    tweet = map(lambda x: cycle_color(x) if x[0]=='@' else x, tweet)
+    tweet = map(lambda x: cyan(x) if x[0:7]=='http://' else x, tweet)
+    tweet = ' '.join(tweet)
 
     # Draw rainbow
     terminalrows, terminalcolumns = os.popen('stty size', 'r').read().split()
@@ -78,11 +71,16 @@ def main():
     args = parse_arguments()
 
     # The Logo
-    asciiart()
-
-    # When using twitter stream you must authorize.
-    oauth_filename = os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.twitter_oauth'
-    oauth_token, oauth_token_secret = read_token_file(oauth_filename)
+    ascii_art()
+
+    # When using rainbow stream you must authorize.
+    twitter_credential = os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.rainbow_oauth'
+    if not os.path.exists(twitter_credential):
+        oauth_dance("Rainbow Stream",
+                    CONSUMER_KEY,
+                    CONSUMER_SECRET,
+                    twitter_credential)
+    oauth_token, oauth_token_secret = read_token_file(twitter_credential)
     auth = OAuth(oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET)
 
     # These arguments are optional: