diff options
Diffstat (limited to 'bin/analyze-archive.py')
| -rwxr-xr-x | bin/analyze-archive.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py index e79d690..a5c0002 100755 --- a/bin/analyze-archive.py +++ b/bin/analyze-archive.py @@ -283,13 +283,6 @@ def main(): show_quality = args.show_quality - if args.filter_param: - args.filter_param = list( - map(dfatool.cli.parse_filter_string, args.filter_param.split(";")) - ) - else: - args.filter_param = list() - if args.filter_observation: args.filter_observation = list( map(lambda x: tuple(x.split(":")), args.filter_observation.split(",")) @@ -388,6 +381,20 @@ def main(): args.ignore_param = args.ignore_param.split(",") dfatool.utils.ignore_param(by_name, parameters, args.ignore_param) + if args.filter_param: + print(parameters) + args.filter_param = list( + map( + lambda entry: dfatool.cli.parse_filter_string( + entry, parameter_names=parameters + ), + args.filter_param.split(";"), + ) + ) + print(args.filter_param) + else: + args.filter_param = list() + dfatool.utils.filter_aggregate_by_param(by_name, parameters, args.filter_param) dfatool.utils.filter_aggregate_by_observation(by_name, args.filter_observation) |