X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fcolors.py;h=bdbc4b44c14d6af7c4009af898b13ed3e86bd44f;hp=4b8ab2c775366eea73e8a12667cb5760f4fc715e;hb=20fc51b989f7793b032b379aed909680f2654546;hpb=7d1fa1122f3969c2c68199562a2c50748ecc9294

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index 4b8ab2c..bdbc4b4 100644
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -1,83 +1,61 @@
-import random
-import 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_shuffle = [grey, red, green, yellow, blue, magenta, cyan]
-background_shuffle = [
-    on_grey,
-    on_red,
-    on_green,
-    on_yellow,
-    on_blue,
-    on_magenta,
-    on_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')]
-    )
-    )
+def basic_color(code):
+    """
+    16 colors supported
+    """
+    def inner(text, bold=True):
+        c = code
+        if bold:
+            c = "1;%s" % c
+        return "\033[%sm%s\033[0m" % (c, text)
+    return inner
+
+
+def term_color(code):
+    """
+    256 colors supported
+    """
+    def inner(text):
+        c = code
+        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')
+green = basic_color('32')
+yellow = basic_color('33')
+blue = basic_color('34')
+magenta = basic_color('35')
+cyan = basic_color('36')
+grey = basic_color('90')
+light_red = basic_color('91')
+light_green = basic_color('92')
+light_yellow = basic_color('93')
+light_blue = basic_color('94')
+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')
+on_green = basic_color('42')
+on_yellow = basic_color('43')
+on_blue = basic_color('44')
+on_magenta = basic_color('45')
+on_cyan = basic_color('46')
+on_grey = basic_color('100')
+on_light_red = basic_color('101')
+on_light_green = basic_color('102')
+on_light_yellow = basic_color('103')
+on_light_blue = basic_color('104')
+on_light_magenta = basic_color('105')
+on_light_cyan = basic_color('106')
+on_white = basic_color('107')