significant bug fix

[rainbowstream.git] / rainbowstream / draw.py

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index 2fbe51de6336ecbf36ce2375d47ee9dd0142549d..60d0ef624bf2928c6108a70e4508666acf480b23 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -18,7 +18,6 @@ from .db import *
 db = RainbowDB()
 g = {}
 
-
 def init_cycle():
     """
     Init the cycle
@@ -42,16 +41,24 @@ 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):
@@ -86,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
@@ -101,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:
@@ -179,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: