X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/b1e8ad75b75badc057f7831d0eea64c7165f8070..17b9ff10207340026b876eb623660f2c79bfe85d:/twitter/ansi.py?ds=sidebyside

diff --git a/twitter/ansi.py b/twitter/ansi.py
index 870dec2..0ae2071 100644
--- a/twitter/ansi.py
+++ b/twitter/ansi.py
@@ -1,27 +1,102 @@
 """
 Support for ANSI colours in command-line client.
 
+.. data:: ESC
+    ansi escape character
+
+.. data:: RESET
+    ansi reset colour (ansi value)
+
+.. data:: COLOURS_NAMED
+    dict of colour names mapped to their ansi value
+
+.. data:: COLOURS_MIDS
+    A list of ansi values for Mid Spectrum Colours
 """
 
 import itertools
+import sys
 
 ESC = chr(0x1B)
 RESET = "0"
 
-COLOURS = [str(x) for x in range(31, 37)]
+COLOURS_NAMED = dict(list(zip(
+    ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'],
+    [str(x) for x in range(30, 38)]
+)))
+COLOURS_MIDS = [
+    colour for name, colour in list(COLOURS_NAMED.items())
+    if name not in ('black', 'white')
+]
+
+class AnsiColourException(Exception):
+    ''' Exception while processing ansi colours '''
+    pass
 
 class ColourMap(object):
-    def __init__(self):
+    '''
+    Object that allows for mapping strings to ansi colour values.
+    '''
+    def __init__(self, colors=COLOURS_MIDS):
+        ''' uses the list of ansi `colors` values to initialize the map '''
         self._cmap = {}
-        self._colourIter = itertools.cycle(COLOURS)
-        
+        self._colourIter = itertools.cycle(colors)
+
     def colourFor(self, string):
-        if not self._cmap.has_key(string):
-            self._cmap[string] = self._colourIter.next()
+        '''
+        Returns an ansi colour value given a `string`.
+        The same ansi colour value is always returned for the same string
+        '''
+        if string not in self._cmap:
+            self._cmap[string] = next(self._colourIter)
         return self._cmap[string]
 
+class AnsiCmd(object):
+    def __init__(self, forceAnsi):
+        self.forceAnsi = forceAnsi
+
+    def cmdReset(self):
+        ''' Returns the ansi cmd colour for a RESET '''
+        if sys.stdout.isatty() or self.forceAnsi:
+            return ESC + "[0m"
+        else:
+            return ""
+
+    def cmdColour(self, colour):
+        '''
+        Return the ansi cmd colour (i.e. escape sequence)
+        for the ansi `colour` value
+        '''
+        if sys.stdout.isatty() or self.forceAnsi:
+            return ESC + "[" + colour + "m"
+        else:
+            return ""
+
+    def cmdColourNamed(self, colour):
+        ''' Return the ansi cmdColour for a given named `colour` '''
+        try:
+            return self.cmdColour(COLOURS_NAMED[colour])
+        except KeyError:
+            raise AnsiColourException('Unknown Colour %s' % (colour))
+
+    def cmdBold(self):
+        if sys.stdout.isatty() or self.forceAnsi:
+            return ESC + "[1m"
+        else:
+            return ""
+
+    def cmdUnderline(self):
+        if sys.stdout.isatty() or self.forceAnsi:
+            return ESC + "[4m"
+        else:
+            return ""
+
+"""These exist to maintain compatibility with users of version<=1.9.0"""
 def cmdReset():
-    return ESC + "[0m"
+    return AnsiCmd(False).cmdReset()
 
 def cmdColour(colour):
-    return ESC + "[" + colour + "m"
+    return AnsiCmd(False).cmdColour(colour)
+
+def cmdColourNamed(colour):
+    return AnsiCmd(False).cmdColourNamed(colour)