Merge pull request #35 from trhura/master

added option to always display tag name, so that we can pipe its output ...
This commit is contained in:
Jake Wharton
2013-10-07 19:56:40 -07:00
+3 -2
View File
@@ -36,6 +36,7 @@ parser.add_argument('package', nargs='+', help='Application package name(s)')
parser.add_argument('-w', '--tag-width', metavar='N', dest='tag_width', type=int, default=22, help='Width of log tag') parser.add_argument('-w', '--tag-width', metavar='N', dest='tag_width', type=int, default=22, help='Width of log tag')
parser.add_argument('-l', '--min-level', dest='min_level', type=str, choices=LOG_LEVELS, default='V', help='Minimum level to be displayed') parser.add_argument('-l', '--min-level', dest='min_level', type=str, choices=LOG_LEVELS, default='V', help='Minimum level to be displayed')
parser.add_argument('--color-gc', dest='color_gc', action='store_true', help='Color garbage collection') parser.add_argument('--color-gc', dest='color_gc', action='store_true', help='Color garbage collection')
parser.add_argument('--always-display-tags', dest='always_tags', action='store_true',help='Always display the tag name')
parser.add_argument('-s', '--serial', dest='device_serial', help='Device serial number (adb -s option)') parser.add_argument('-s', '--serial', dest='device_serial', help='Device serial number (adb -s option)')
parser.add_argument('-d', '--device', dest='use_device', action='store_true', help='Use first device for log input (adb -d option).') parser.add_argument('-d', '--device', dest='use_device', action='store_true', help='Use first device for log input (adb -d option).')
parser.add_argument('-e', '--emulator', dest='use_emulator', action='store_true', help='Use first emulator for log input (adb -e option).') parser.add_argument('-e', '--emulator', dest='use_emulator', action='store_true', help='Use first emulator for log input (adb -e option).')
@@ -227,7 +228,7 @@ while adb.poll() is None:
# right-align tag title and allocate color if needed # right-align tag title and allocate color if needed
tag = tag.strip() tag = tag.strip()
if tag != last_tag: if tag != last_tag or args.always_tags:
last_tag = tag last_tag = tag
color = allocate_color(tag) color = allocate_color(tag)
tag = tag[-args.tag_width:].rjust(args.tag_width) tag = tag[-args.tag_width:].rjust(args.tag_width)
@@ -247,4 +248,4 @@ while adb.poll() is None:
message = matcher.sub(replace, message) message = matcher.sub(replace, message)
linebuf += indent_wrap(message) linebuf += indent_wrap(message)
print(linebuf) print(linebuf.encode('utf-8'))