Merge pull request #185 from Jorick/master

[rainbowstream.git] / rainbowstream / colors.py

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index 909a85af3e5fc0bcc9fc32dad41d0935ff4c70c7..a39dcb6b0c41ac9d78e1495c27e92bf4cda17d56 100644 (file)
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -1,33 +1,40 @@
-import random
-import itertools
-from functools import wraps
-from pyfiglet import figlet_format
-from .config import *
-from functools import reduce
-
-
 def basic_color(code):
     """
     16 colors supported
     """
-    def inner(text, bold=True):
+    def inner(text, rl=False):
+        """
+        Every raw_input with color sequences should be called with
+        rl=True to avoid readline messed up the length calculation
+        """
         c = code
-        if bold:
-            c = "1;%s" % c
-        return "\033[%sm%s\033[0m" % (c, text)
+        if rl:
+            return "\001\033[%sm\002%s\001\033[0m\002" % (c, text)
+        else:
+            return "\033[%sm%s\033[0m" % (c, text)
     return inner
 
 
-def RGB(code):
+def term_color(code):
     """
     256 colors supported
     """
-    def inner(text):
+    def inner(text, rl=False):
+        """
+        Every raw_input with color sequences should be called with
+        rl=True to avoid readline messed up the length calculation
+        """
         c = code
-        return "\033[38;5;%sm%s\033[0m" % (c, text)
+        if rl:
+            return "\001\033[38;5;%sm\002%s\001\033[0m\002" % (c, text)
+        else:
+            return "\033[38;5;%sm%s\033[0m" % (c, text)
     return inner
 
 
+"""
+16 basic colors
+"""
 default = basic_color('39')
 black = basic_color('30')
 red = basic_color('31')
@@ -45,6 +52,9 @@ light_magenta = basic_color('95')
 light_cyan = basic_color('96')
 white = basic_color('97')
 
+"""
+16 basic colors on background
+"""
 on_default = basic_color('49')
 on_black = basic_color('40')
 on_red = basic_color('41')
@@ -61,65 +71,3 @@ on_light_blue = basic_color('104')
 on_light_magenta = basic_color('105')
 on_light_cyan = basic_color('106')
 on_white = basic_color('107')
-
-colors_shuffle = [locals()[i.encode('utf8')] if not i.startswith(
-    'RGB_') else RGB(int(i[4:])) for i in c['CYCLE_COLOR']]
-
-background_shuffle = [
-    on_grey,
-    on_light_red,
-    on_light_green,
-    on_light_yellow,
-    on_light_blue,
-    on_light_magenta,
-    on_light_cyan]
-cyc = itertools.cycle(colors_shuffle[1:])
-
-
-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)
-
-
-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)
-
-
-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_shuffle
-    """
-    return next(cyc)(s)
-
-
-def ascii_art(text):
-    """
-    Draw the Ascii Art
-    """
-    fi = figlet_format(text, font='doom')
-    print('\n'.join(
-        [next(cyc)(i) for i in fi.split('\n')]
-    )
-    )