diff --git a/data/devices/data-parse-test.py b/data/devices/data-parse-test.py index 9db88e01..122f9be1 100755 --- a/data/devices/data-parse-test.py +++ b/data/devices/data-parse-test.py @@ -26,6 +26,7 @@ import argparse import configparser +import pathlib import re @@ -220,8 +221,8 @@ def parse_data_file(path): if __name__ == "__main__": parser = argparse.ArgumentParser(description="Device data-file checker") - parser.add_argument('file', nargs='+') + parser.add_argument("directory") args = parser.parse_args() - for path in args.file: + for path in pathlib.Path(args.directory).glob("*.device"): validate_data_file_name(path) parse_data_file(path) diff --git a/data/devices/duplicate-check.py b/data/devices/duplicate-check.py index 332f1253..388517c9 100755 --- a/data/devices/duplicate-check.py +++ b/data/devices/duplicate-check.py @@ -24,6 +24,7 @@ import argparse import os +import pathlib import sys import configparser @@ -40,11 +41,11 @@ def parse_data_file(path): if __name__ == "__main__": parser = argparse.ArgumentParser(description='Device duplicate match checker') - parser.add_argument('file', nargs='+') + parser.add_argument("directory") args = parser.parse_args() device_matches = {} duplicates = False - for path in args.file: + for path in pathlib.Path(args.directory).glob("*.device"): matches = parse_data_file(path) fname = os.path.basename(path) for m in matches: diff --git a/data/devices/receiver-check.py b/data/devices/receiver-check.py index ed115417..47d5c60f 100755 --- a/data/devices/receiver-check.py +++ b/data/devices/receiver-check.py @@ -24,6 +24,7 @@ import argparse import os +import pathlib import sys import configparser @@ -61,10 +62,10 @@ def parse_data_file(path): if __name__ == "__main__": parser = argparse.ArgumentParser(description='Checks that no unifying receiver ID is in the device files') - parser.add_argument('file', nargs='+') + parser.add_argument("directory") args = parser.parse_args() receiver_found = False - for path in args.file: + for path in pathlib.Path(args.directory).glob("*.device"): matches = parse_data_file(path) fname = os.path.basename(path) for m in matches: diff --git a/meson.build b/meson.build index d79ae15a..30c145e6 100644 --- a/meson.build +++ b/meson.build @@ -371,13 +371,13 @@ install_data(data_files, install_dir : join_paths(get_option('datadir'), 'libratbag')) data_parse_test = find_program(join_paths(meson.source_root(), 'data/devices/data-parse-test.py')) -test('data-parse-test', data_parse_test, args: data_files) +test('data-parse-test', data_parse_test, args: 'data/devices') duplicate_test = find_program(join_paths(meson.source_root(), 'data/devices/duplicate-check.py')) -test('duplicate-test', duplicate_test, args : data_files) +test('duplicate-test', duplicate_test, args : 'data/devices') reciever_id_test = find_program(join_paths(meson.source_root(), 'data/devices/receiver-check.py')) -test('receiver-id-test', reciever_id_test, args : data_files) +test('receiver-id-test', reciever_id_test, args : 'data/devices') #### tests #### enable_tests = get_option('tests')