redefine color and use seperate Twitter Oauth credential

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index 13ab6372f42c8c6e1f19ad73b41c0431e7081f21..84e3ad846a399ab1f5d34b8b624a2d173f694e9c 100644 (file)
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -1,16 +1,71 @@
-def _wrap_with(code):
-
-    def inner(text, bold=False):
-        c = code
-        if bold:
-            c = "1;%s" % c
-        return "\033[%sm%s\033[0m" % (c, text)
-    return inner
-
-red = _wrap_with('31')
-green = _wrap_with('32')
-yellow = _wrap_with('33')
-blue = _wrap_with('34')
-magenta = _wrap_with('35')
-cyan = _wrap_with('36')
-white = _wrap_with('37')
\ No newline at end of file
+import random, itertools
+from functools import wraps
+from termcolor import *
+from pyfiglet import figlet_format
+
+grey    = lambda x: colored(x, 'grey', attrs=['bold'])
+red     = lambda x: colored(x, 'red', attrs=['bold'])
+green   = lambda x: colored(x, 'green', attrs=['bold'])
+yellow  = lambda x: colored(x, 'yellow', attrs=['bold'])
+blue    = lambda x: colored(x, 'blue', attrs=['bold'])
+magenta = lambda x: colored(x, 'magenta', attrs=['bold'])
+cyan    = lambda x: colored(x, 'cyan', attrs=['bold'])
+white   = lambda x: colored(x, 'white', attrs=['bold'])
+
+on_grey    = lambda x: colored(x, 'white', 'on_grey', attrs=['bold'])
+on_red     = lambda x: colored(x, 'white', 'on_red', attrs=['bold'])
+on_green   = lambda x: colored(x, 'white', 'on_green', attrs=['bold'])
+on_yellow  = lambda x: colored(x, 'white', 'on_yellow', attrs=['bold'])
+on_blue    = lambda x: colored(x, 'white', 'on_blue', attrs=['bold'])
+on_magenta = lambda x: colored(x, 'white', 'on_magenta', attrs=['bold'])
+on_cyan    = lambda x: colored(x, 'white', 'on_cyan', attrs=['bold'])
+on_white   = lambda x: colored(x, 'white', 'on_white', attrs=['bold'])
+
+colors_shufle = [grey, red, green, yellow, blue, magenta, cyan]
+background_shufle = [on_grey, on_red, on_green, on_yellow, on_blue, on_magenta, on_cyan]
+cyc = itertools.cycle(colors_shufle[1:])
+
+
+def order_rainbow(s):
+    """
+    Print a string with ordered color with each character
+    """
+    c = [colors_shufle[i%7](s[i]) for i in xrange(len(s))]
+    return reduce(lambda x,y: x+y, c)
+
+def random_rainbow(s):
+    """
+    Print a string with random color with each character
+    """
+    c = [random.choice(colors_shufle)(i) for i in s]
+    return reduce(lambda x,y: x+y, c)
+
+def Memoize(func):
+    """
+    Memoize decorator
+    """
+    cache = {}
+    @wraps(func)
+    def wrapper(*args):
+        if args not in cache:
+            cache[args] = func(*args)
+        return cache[args]
+    return wrapper
+
+@Memoize
+def cycle_color(s):
+    """
+    Cycle the colors_shufle
+    """
+    return next(cyc)(s)
+
+def ascii_art():
+    """
+    Draw the Ascii Art
+    """
+    fi = figlet_format('Rainbow Stream', font='doom')
+    print('\n'.join(
+            [next(cyc)(i) for i in fi.split('\n')]
+        )
+    )
+

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 2ede83b246ef6040dbfa1e471e70a5778d54c057..8efd093ea155eed3aa2c75aaf4860ed37dcb8698 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,3 +1,3 @@
 # This is PTT App info
-CONSUMER_KEY = 'uS6hO2sV6tDKIOeVjhnFnQ'
-CONSUMER_SECRET = 'MEYTOS97VvlHX7K1rwHPEqVpTSqZ71HtvoK4sVuYk'
+CONSUMER_KEY = 'Xk1DGhR1FJa4xjg7GbdogzLJw'
+CONSUMER_SECRET = 'SpHtDmbSGCSm55AAlIeb2PsD3kGEzxyo1325rJgrND5abeOh2T'

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 43fa026999848d1e98c720d5babc2922d6c51644..cdddef2c6979c829772a0c0edd645bd7693acca2 100644 (file)
--- 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:

diff --git a/setup.py b/setup.py
index 0aa173ed38032e06801b17bb8bb22a4d52683d6d..2ec00ec8a3da8ab5acf12dd56229458f2cab9e0e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,4 @@
 from setuptools import setup, find_packages
-import sys, os
 
 version = '0.0.1'