imcarlost/pidcat-repl
1
0
Fork 0
mirror of https://github.com/imcarlost/pidcat-repl.git synced 2026-08-08 23:17:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from trhura/master

Browse Source 
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
parent 1e997a26e8 6b6034ab67
commit 09eaba028a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pidcat.py
+11 -10
View File
@@ -3,16 +3,16 @@
'''
Copyright 2009, The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
'''
@@ -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('-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('--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('-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).')
@@ -227,7 +228,7 @@ while adb.poll() is None:
# right-align tag title and allocate color if needed
tag = tag.strip()
if tag != last_tag:
if tag != last_tag or args.always_tags:
last_tag = tag
color = allocate_color(tag)
tag = tag[-args.tag_width:].rjust(args.tag_width)
@@ -247,4 +248,4 @@ while adb.poll() is None:
message = matcher.sub(replace, message)
linebuf += indent_wrap(message)
print(linebuf)
print(linebuf.encode('utf-8'))