From a8e353fe3134f5751bd3dc4c07545cf6ef34c0ae Mon Sep 17 00:00:00 2001 From: Moritz Raabe Date: Thu, 20 May 2021 14:00:01 +0200 Subject: [PATCH] revert rule loading pbar --- CHANGELOG.md | 2 +- capa/main.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a391db12..27964fc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ It includes many new rules, including all new techniques introduced in MITRE ATT - explorer: IDA 7.6 support #497 @williballenthin - scripts: capa2yara.py convert capa rules to YARA rules #561 @ruppde - main: auto detect shellcode based on file extension #516 @mr-tz -- main: more detailed progress bar output when loading rules and matching functions #562 @mr-tz +- main: more detailed progress bar output when matching functions #562 @mr-tz ### New Rules (69) diff --git a/capa/main.py b/capa/main.py index 3c1bacd3..0da06ea6 100644 --- a/capa/main.py +++ b/capa/main.py @@ -786,7 +786,7 @@ def main(argv=None): logger.debug("using rules path: %s", rules_path) try: - rules = get_rules(rules_path, disable_progress=args.quiet or args.tag) + rules = get_rules(rules_path, disable_progress=args.quiet) rules = capa.rules.RuleSet(rules) logger.debug( "successfully loaded %s rules", @@ -796,13 +796,7 @@ def main(argv=None): len([i for i in filter(lambda r: "capa/subscope-rule" not in r.meta, rules.rules.values())]), ) if args.tag: - n_rules_all = len(rules) rules = rules.filter_rules_by_meta(args.tag) - n_rules = len(rules) - diff = n_rules_all - n_rules - if not args.quiet: - for _ in tqdm.trange(n_rules, desc="loading ", unit=" rules", postfix="skipped %d rules" % diff): - pass for i, r in enumerate(rules.rules, 1): logger.debug("selected %d rules", len(rules)) # TODO don't display subscope rules?