From 8760bd9c7917e9c7c6897aa246813e1ad60b4206 Mon Sep 17 00:00:00 2001
From: oakkitten <oakkitten@users.noreply.github.com>
Date: Sat, 5 Sep 2015 18:35:34 +0300
Subject: [PATCH] Colorization on Windows using colorama

Added option -f/-force-windows-colors to force colorization if terminal
is tty but actually expects windows colors
---
 CHANGELOG.md |  5 +++++
 README.md    |  3 +++
 pidcat.py    | 10 +++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa6d85a..cf74959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.0.1 *(2015-09-15)*
+----------------------------
+ * New: Fix colors on Windows. Use options `-f` / `--force-windows-colors` to force conversion
+   in case a terminal appears to be a tty. Requires module `colorama`
+
 Version 2.0.0 *(2015-05-25)*
 ----------------------------
 
diff --git a/README.md b/README.md
index 8c3335b..c77bca0 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,9 @@ Make sure that `adb` from the [Android SDK][3] is on your PATH. This script will
 not work unless this is that case. That means, when you type `adb` and press
 enter into your terminal something actually happens.
 
+On Windows, you can do `pip install colorama` if you see weird arrows instead of
+colors. In case that does not help, try using option `-f`.
+
 To include `adb` and other android tools on your path:
 
     export PATH=$PATH:<path to Android SDK>/platform-tools
diff --git a/pidcat.py b/pidcat.py
index b430d6f..c7f155b 100755
--- a/pidcat.py
+++ b/pidcat.py
@@ -27,7 +27,7 @@
 import subprocess
 from subprocess import PIPE
 
-__version__ = '2.0.0'
+__version__ = '2.0.1'
 
 LOG_LEVELS = 'VDIWEF'
 LOG_LEVELS_MAP = dict([(LOG_LEVELS[i], i) for i in range(len(LOG_LEVELS))])
@@ -46,6 +46,7 @@
 parser.add_argument('-i', '--ignore-tag', dest='ignored_tag', action='append', help='Filter output by ignoring specified tag(s)')
 parser.add_argument('-v', '--version', action='version', version='%(prog)s ' + __version__, help='Print the version number and exit')
 parser.add_argument('-a', '--all', dest='all', action='store_true', default=False, help='Print all log messages')
+parser.add_argument('-f', '--force-windows-colors', dest='force_windows_colors', action='store_true', default=False, help='Force converting colors to Windows format')
 
 args = parser.parse_args()
 min_level = LOG_LEVELS_MAP[args.min_level.upper()]
@@ -86,6 +87,13 @@
 except:
   pass
 
+try:
+  import colorama
+  colorama.init(convert=args.force_windows_colors)
+except ImportError:
+  if args.force_windows_colors:
+    raise
+
 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
 
 RESET = '\033[0m'