revert rule loading pbar

This commit is contained in:
Moritz Raabe
2021-05-20 14:00:01 +02:00
parent 8a386b6909
commit a8e353fe31
2 changed files with 2 additions and 8 deletions

View File

@@ -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)

View File

@@ -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?