Skip to content

Add option --proguard-mapping to interpret class names correctly when using proguard #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fcamel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option --proguard-mapping to interpret class names correctly when using proguard #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pidcat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
parser.add_argument('-c', '--clear', dest='clear_logcat', action='store_true', help='Clear the entire log before running')
parser.add_argument('-t', '--tag', dest='tag', action='append', help='Filter output by specified tag(s)')
parser.add_argument('-i', '--ignore-tag', dest='ignored_tag', action='append', help='Filter output by ignoring specified tag(s)')
parser.add_argument('--proguard-mapping', dest='proguard_mapping', action='store', help='Use proguard mapping to translate the input tag names')
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')

Expand All @@ -66,6 +67,18 @@
running_package_name = re.search(".*TaskRecord.*A[= ]([^ ^}]*)", system_dump).group(1)
package.append(running_package_name)

PROGUARD_MAPPING = re.compile(r'^([\w$\.]+)\s->\s*([\w$\.]+)')

proguard_mapping = {}
if args.proguard_mapping:
with open(args.proguard_mapping) as fr:
for line in fr:
mapping_match = PROGUARD_MAPPING.match(line.strip())
if mapping_match is not None:
from_ = mapping_match.group(1)
to = mapping_match.group(2)
proguard_mapping[to] = from_

if len(package) == 0:
args.all = True

Expand Down Expand Up @@ -288,6 +301,7 @@ def tag_in_tags_regex(tag, tags):

level, tag, owner, message = log_line.groups()
tag = tag.strip()
tag = proguard_mapping.get(tag, tag)
start = parse_start_proc(line)
if start:
line_package, target, line_pid, line_uid, line_gids = start
Expand Down