fix -iot bug

[rainbowstream.git] / rainbowstream / draw.py

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index bdeafdfc77ca8ce01d308c05d94b070d39156a2a..faf57f93a5ed97d47e8c05f4194c3fe912bc5345 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -26,44 +26,52 @@ def init_cycle():
         if not i.startswith('term_')
         else term_color(int(i[5:]))
         for i in c['CYCLE_COLOR']]
-    return colors_shuffle, itertools.cycle(colors_shuffle)
-g['colors_shuffle'], g['cyc'] = init_cycle()
+    return itertools.cycle(colors_shuffle)
+g['cyc'] = init_cycle()
+g['cache'] = {}
 
 
-def notify_cycle():
+def reset_cycle():
     """
     Notify from rainbow
     """
-    g['colors_shuffle'], g['cyc'] = init_cycle()
+    g['cyc'] = init_cycle()
+    g['cache'] = {}
 
 
 def order_rainbow(s):
     """
     Print a string with ordered color with each character
     """
-    c = [g['colors_shuffle'][i % 7](s[i]) for i in xrange(len(s))]
-    return reduce(lambda x, y: x + y, c)
+    colors_shuffle = [globals()[i.encode('utf8')]
+        if not i.startswith('term_')
+        else term_color(int(i[5:]))
+        for i in c['CYCLE_COLOR']]
+    colored = [colors_shuffle[i % 7](s[i]) for i in xrange(len(s))]
+    return reduce(lambda x, y: x + y, colored)
 
 
 def random_rainbow(s):
     """
     Print a string with random color with each character
     """
-    c = [random.choice(g['colors_shuffle'])(i) for i in s]
-    return reduce(lambda x, y: x + y, c)
+    colors_shuffle = [globals()[i.encode('utf8')]
+        if not i.startswith('term_')
+        else term_color(int(i[5:]))
+        for i in c['CYCLE_COLOR']]
+    colored = [random.choice(colors_shuffle)(i) for i in s]
+    return reduce(lambda x, y: x + y, colored)
 
 
 def Memoize(func):
     """
     Memoize decorator
     """
-    cache = {}
-
     @wraps(func)
     def wrapper(*args):
-        if args not in cache:
-            cache[args] = func(*args)
-        return cache[args]
+        if args not in g['cache']:
+            g['cache'][args] = func(*args)
+        return g['cache'][args]
     return wrapper
 
 
@@ -197,7 +205,7 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     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')
+        meta = meta + color_func(c['TWEET']['favorited'])(u'\u2605')
     tweet = text.split()
     # Replace url
     if expanded_url: