Set -hr as default and drop the config

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 37da689850fb61eb799ecdeabd292f60d3ed838b..f26cfcf1c5a471cc33300f9dcf2b84677a22de7f 100644 (file)
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -71,27 +71,25 @@ def image_to_display(path, start=None, length=None):
     i.load()
     width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
     i.load()
     width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))

-    if c['HIGHER_RESOLUTION'] is False:
-        height //= 2

     i = i.resize((width, height), Image.ANTIALIAS)
     height = min(height, c['IMAGE_MAX_HEIGHT'])
 
     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')
+
+    # Old code for display one pixel on one terminal block
+    # 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')

 
 
 """
 
 
 """

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index a5cc190b858f175121cf5596a001077684b57899..a0bdaddeda4d90b1c4d4748362930e813d51bed9 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -72,11 +72,6 @@ def parse_arguments():
         '--color-24bit',
         action='store_true',
         help='Display images using 24bit color codes.')
         '--color-24bit',
         action='store_true',
         help='Display images using 24bit color codes.')

-    parser.add_argument(
-        '-hr',
-        '--higher-resolution',
-        action='store_true',
-        help='Display images in high(er) resolution.')

     parser.add_argument(
         '-ph',
         '--proxy-host',
     parser.add_argument(
         '-ph',
         '--proxy-host',


@@ -246,9 +241,6 @@ def init(args):
     set_config('IMAGE_ON_TERM', str(c['IMAGE_ON_TERM']))
     # Use 24 bit color
     c['24BIT'] = args.color_24bit
     set_config('IMAGE_ON_TERM', str(c['IMAGE_ON_TERM']))
     # Use 24 bit color
     c['24BIT'] = args.color_24bit

-    # Print images using half height blocks
-    c['HIGHER_RESOLUTION'] = args.higher_resolution
-    set_config('HIGHER_RESOLUTION', str(c['HIGHER_RESOLUTION']))

     # Check type of ONLY_LIST and IGNORE_LIST
     if not isinstance(c['ONLY_LIST'], list):
         printNicely(red('ONLY_LIST is not a valid list value.'))
     # Check type of ONLY_LIST and IGNORE_LIST
     if not isinstance(c['ONLY_LIST'], list):
         printNicely(red('ONLY_LIST is not a valid list value.'))