Merge pull request #34 from BryanSalas/master

[rainbowstream.git] / rainbowstream / c_image.py

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index bc2112e02fc85f6bc27b0c2fcd30cf67cd9dc439..8bd93288812662f2ac19b074d8cce8071d050362 100644 (file)
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -8,6 +8,9 @@ import os
 
 
 def call_c():
+    """
+    Call the C program for converting RGB to Ansi colors
+    """
     library = expanduser('~/.image.so')
     sauce = join(dirname(__file__), 'image.c')
     if not exists(library) or getmtime(sauce) > getmtime(library):
@@ -21,13 +24,19 @@ rgb2short = call_c()
 
 
 def pixel_print(ansicolor):
+    """
+    Print a pixel with given Ansi color
+    """
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
-def image_to_display(path,start=None,length=None):
+def image_to_display(path, start=None, length=None):
+    """
+    Display an image
+    """
     rows, columns = os.popen('stty size', 'r').read().split()
     if not start:
-        start = IMAGE_SHIFT
+        start = c['IMAGE_SHIFT']
     if not length:
         length = int(columns) - 2 * start
     i = Image.open(path)
@@ -38,15 +47,19 @@ def image_to_display(path,start=None,length=None):
     height = int(float(h) * (float(width) / float(w)))
     height //= 2
     i = i.resize((width, height), Image.ANTIALIAS)
-    height = min(height, IMAGE_MAX_HEIGHT)
+    height = min(height, c['IMAGE_MAX_HEIGHT'])
 
-    for y in xrange(height):
-        print ' ' * start,
-        for x in xrange(width):
+    for y in range(height):
+        sys.stdout.write(' ' * start)
+        for x in range(width):
             p = i.getpixel((x, y))
             r, g, b = p[:3]
             pixel_print(rgb2short(r, g, b))
-        print ''
+        sys.stdout.write('\n')
 
+
+"""
+For direct using purpose
+"""
 if __name__ == '__main__':
     image_to_display(sys.argv[1])