X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fcolors.py;h=bdbc4b44c14d6af7c4009af898b13ed3e86bd44f;hp=b88b5e5f3bf0b9cfb4e4bbb090506518c56c6dc0;hb=0d9977c739e5e448af4b49332bd6df1aa9edafc3;hpb=533edcdb18f9b2aa00fa8f00c7093ae219765b53

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index b88b5e5..bdbc4b4 100644
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -1,114 +1,61 @@
-import random
-import itertools
-from functools import wraps
-from termcolor import *
-from pyfiglet import figlet_format
-
-def color_code(code):
-    def inner(text, bold=False):
+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
 
-default          = color_code('39')
-black            = color_code('30')
-red              = color_code('31')
-green            = color_code('32')
-yellow           = color_code('33')
-blue             = color_code('34')
-magenta          = color_code('35')
-cyan             = color_code('36')
-grey             = color_code('90')
-light_red        = color_code('91')
-light_green      = color_code('92')
-light_yellow     = color_code('103')
-light_blue       = color_code('104')
-light_magenta    = color_code('105')
-light_cyan       = color_code('106')
-white            = color_code('107')
-
-on_default       = color_code('49')
-on_black         = color_code('40')
-on_red           = color_code('41')
-on_green         = color_code('42')
-on_yellow        = color_code('43')
-on_blue          = color_code('44')
-on_magenta       = color_code('45')
-on_cyan          = color_code('46')
-on_grey          = color_code('100')
-on_light_red     = color_code('101')
-on_light_green   = color_code('102')
-on_light_yellow  = color_code('103')
-on_light_blue    = color_code('104')
-on_light_magenta = color_code('105')
-on_light_cyan    = color_code('106')
-on_white         = color_code('107')
-
-colors_shuffle = [
-    grey,
-    light_red,
-    light_green,
-    light_yellow,
-    light_blue,
-    light_magenta,
-    light_cyan]
-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):
+def term_color(code):
     """
-    Print a string with ordered color with each character
+    256 colors supported
     """
-    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 inner(text):
+        c = code
+        return "\033[38;5;%sm%s\033[0m" % (c, text)
+    return inner
 
 
-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')]
-    )
-    )
+"""
+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')