X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=rainbowstream%2Fdraw.py;h=faf57f93a5ed97d47e8c05f4194c3fe912bc5345;hb=67339c791423388f874cc214f7fc27d39c5df83b;hp=a44450cc0486ea1188ae7ed640f1cde39c8d36a1;hpb=1fdd6a5c32958860b8fbdb400a5328f7522c2985;p=rainbowstream.git

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index a44450c..faf57f9 100644
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -18,46 +18,60 @@ from .db import *
 db = RainbowDB()
 g = {}
 
-
 def init_cycle():
     """
     Init the cycle
     """
     colors_shuffle = [globals()[i.encode('utf8')]
-        if not i.startswith('RGB_')
-        else RGB(int(i[4:]))
+        if not i.startswith('term_')
+        else term_color(int(i[5:]))
         for i in c['CYCLE_COLOR']]
     return itertools.cycle(colors_shuffle)
 g['cyc'] = init_cycle()
+g['cache'] = {}
+
+
+def reset_cycle():
+    """
+    Notify from rainbow
+    """
+    g['cyc'] = init_cycle()
+    g['cache'] = {}
 
 
 def order_rainbow(s):
     """
     Print a string with ordered color with each character
     """
-    c = [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(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
 
 
@@ -79,6 +93,25 @@ def ascii_art(text):
     ))
 
 
+def show_calendar(month, date, rel):
+    """
+    Show the calendar in rainbow mode
+    """
+    month = random_rainbow(month)
+    date = ' '.join([cycle_color(i) for i in date.split(' ')])
+    today = str(int(os.popen('date +\'%d\'').read().strip()))
+    # Display
+    printNicely(month)
+    printNicely(date)
+    for line in rel:
+        ary = line.split(' ')
+        ary = map(lambda x: color_func(c['CAL']['today'])(x)
+            if x == today
+            else color_func(c['CAL']['days'])(x)
+            , ary)
+        printNicely(' '.join(ary))
+
+
 def check_theme():
     """
     Check current theme and update if necessary
@@ -94,7 +127,7 @@ def check_theme():
                 os.environ.get('USERPROFILE',
                 '')) + os.sep + '.rainbow_config.json'
         else:
-            config = 'rainbowstream/colorset/'+c['theme']+'.json'
+            config = os.path.dirname(__file__) + '/colorset/'+c['theme']+'.json'
         # Load new config
         data = load_config(config)
         if data:
@@ -109,8 +142,8 @@ def color_func(func_name):
     Call color function base on name
     """
     pure = func_name.encode('utf8')
-    if pure.startswith('RGB_') and pure[4:].isdigit():
-        return RGB(int(pure[4:]))
+    if pure.startswith('term_') and pure[5:].isdigit():
+        return term_color(int(pure[5:]))
     return globals()[pure]
 
 
@@ -172,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: