Merge pull request #156 from Azy8BsKXVko/fix_muting

[rainbowstream.git] / rainbowstream / c_image.py

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index a1395f3acfe53fd81b0561e9a4c5ad833c631fbc..b26142d8227dd8865ee77cd14277f545baa72f87 100644 (file)
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from PIL import Image
 from os.path import join, dirname, getmtime, exists, expanduser
 from .config import *
@@ -29,8 +30,13 @@ def pixel_print(pixel):
     Print a pixel with given Ansi color
     """
     r, g, b = pixel[:3]
-    ansicolor = rgb2short(r, g, b)
-    sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
+
+    if c['24BIT'] is True:
+        sys.stdout.write('\033[48;2;%d;%d;%dm \033[0m'
+                         % (r, g, b))
+    else:
+        ansicolor = rgb2short(r, g, b)
+        sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
 def block_print(higher, lower):
@@ -65,27 +71,28 @@ def image_to_display(path, start=None, length=None):
     i.load()
     width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
-    if c['HIGHER_RESOLUTION'] is False:
-        height //= 2
+
+    if c['IMAGE_RESIZE_TO_FIT'] is True:
+        # If it image won't fit in the terminal without scrolling shrink it
+        # Subtract 3 from rows so the tweet message fits in too.
+        h = 2 * (int(rows) - 3)
+        if height >= h:
+            width = int(float(width) * (float(h) / float(height)))
+            height = h
+    if (height <= 0) or (width <= 0):
+        raise ValueError("image has negative dimensions")
+
     i = i.resize((width, height), Image.ANTIALIAS)
     height = min(height, c['IMAGE_MAX_HEIGHT'])
 
-    if c['HIGHER_RESOLUTION'] is True:
-        for real_y in xrange(height // 2):
-            sys.stdout.write(' ' * start)
-            for x in xrange(width):
-                y = real_y * 2
-                p0 = i.getpixel((x, y))
-                p1 = i.getpixel((x, y+1))
-                block_print(p1, p0)
-            sys.stdout.write('\n')
-    else:
-        for y in xrange(height):
-            sys.stdout.write(' ' * start)
-            for x in xrange(width):
-                p = i.getpixel((x, y))
-                pixel_print(p)
-            sys.stdout.write('\n')
+    for real_y in xrange(height // 2):
+        sys.stdout.write(' ' * start)
+        for x in xrange(width):
+            y = real_y * 2
+            p0 = i.getpixel((x, y))
+            p1 = i.getpixel((x, y + 1))
+            block_print(p1, p0)
+        sys.stdout.write('\n')
 
 
 """