final version

diff --git a/rainbowstream/colorset/larapaste.json b/rainbowstream/colorset/larapaste.json
index b599bd292dfb476c5258b31ead9e4dfd79bc6227..5f1dc11a0f14fdaa3fe414f64e1e20ce4679a44d 100644 (file)
--- a/rainbowstream/colorset/larapaste.json
+++ b/rainbowstream/colorset/larapaste.json
@@ -38,8 +38,8 @@
     "MESSAGE" : {
         "partner"       : 37,
         "me"            : 37,
-        "me_frame"      : 154,
-        "partner_frame" : "white",
+        "me_frame"      : 202,
+        "partner_frame" : 154,
         "sender"        : 37,
         "recipient"     : 37,
         "to"            : 154,

diff --git a/rainbowstream/colorset/monokai.json b/rainbowstream/colorset/monokai.json
index 736ebec50b39227ecfa2abe8ba20950d8da3241b..7edabe2b56cc78081e7e837709a3a4d640d905ad 100644 (file)
--- a/rainbowstream/colorset/monokai.json
+++ b/rainbowstream/colorset/monokai.json
@@ -39,7 +39,7 @@
         "partner"       : 112,
         "me"            : 112,
         "me_frame"      : 74,
-        "partner_frame" : "white",
+        "partner_frame" : 198,
         "sender"        : 112,
         "recipient"     : 112,
         "to"            : 50,

diff --git a/rainbowstream/colorset/solarized.json b/rainbowstream/colorset/solarized.json
index 65bb09accf1f33d37a717f117d26dab852a28899..8cd7c5c558ea7a6c02e34d5b44ddff8f1af8bfe3 100644 (file)
--- a/rainbowstream/colorset/solarized.json
+++ b/rainbowstream/colorset/solarized.json
@@ -39,7 +39,7 @@
         "partner"       : 64,
         "me"            : 64,
         "me_frame"      : 23,
-        "partner_frame" : "white",
+        "partner_frame" : 124,
         "sender"        : 64,
         "recipient"     : 64,
         "to"            : 130,

diff --git a/rainbowstream/colorset/tomorrow_night.json b/rainbowstream/colorset/tomorrow_night.json
index 31caa8cb71e93a2901b4fce8811dd76c317195de..084e7552e1af0e41b4c8aa815df32503635f455f 100644 (file)
--- a/rainbowstream/colorset/tomorrow_night.json
+++ b/rainbowstream/colorset/tomorrow_night.json
@@ -39,7 +39,7 @@
         "partner"       : 67,
         "me"            : 67,
         "me_frame"      : 30,
-        "partner_frame" : "white",
+        "partner_frame" : 166,
         "sender"        : 67,
         "recipient"     : 67,
         "to"            : 97,

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index fe13d172a5f6feef7f75d605e73574be7d82356f..9f8a0eb9adcf5c3dda181d1d804d813a2717166b 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -1,4 +1,5 @@
 import random
+import textwrap
 import itertools
 import requests
 import locale
@@ -341,9 +342,9 @@ def print_thread(partner, me_nick, me_name):
     messages = dg['thread'][partner]
     messages.sort(key=lambda x: parser.parse(x['created_at']))
     # Use legacy display on non-ascii text message
-    text_ary = [m['text'] for m in messages]
-    not_ascii_text_ary = [t for t in text_ary if not is_ascii(t)]
-    if not_ascii_text_ary:
+    ms = [m['text'] for m in messages]
+    ums = [m for m in ms if not all(ord(c) < 128 for c in m)]
+    if ums:
         for m in messages:
             print_message(m)
         printNicely('')
@@ -383,7 +384,7 @@ def print_right_message(m):
     w = int(w)
     frame_width = w // 3 - dg['frame_margin']
     step = frame_width - 2 * dg['frame_margin']
-    slicing = [m['text'][i:i + step] for i in range(0, len(m['text']), step)]
+    slicing = textwrap.wrap(m['text'], step)
     spaces = w - frame_width - dg['frame_margin']
     dotline = ' ' * spaces + '-' * frame_width
     dotline = color_func(c['MESSAGE']['me_frame'])(dotline)
@@ -446,7 +447,7 @@ def print_left_message(m):
     w = int(w)
     frame_width = w // 3 - dg['frame_margin']
     step = frame_width - 2 * dg['frame_margin']
-    slicing = [m['text'][i:i + step] for i in range(0, len(m['text']), step)]
+    slicing = textwrap.wrap(m['text'], step)
     spaces = dg['frame_margin']
     dotline = ' ' * spaces + '-' * frame_width
     dotline = color_func(c['MESSAGE']['partner_frame'])(dotline)

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
index 35927ee3533055bede60f655520892f9e2c9d788..4ba959110dd8a202f8c410cda9064317c5e3822b 100644 (file)
--- a/rainbowstream/py3patch.py
+++ b/rainbowstream/py3patch.py
@@ -30,10 +30,3 @@ else:
     raw_input = input
     lmap = lambda f, a: list(map(f, a))
     str2u = u2str = lambda x: x
-
-
-def is_ascii(s):
-    """
-    Check if multibyte character or not
-    """
-    return all(ord(c) < 128 for c in s)