From 8e500c36709d6b3c1d1906db22d635ea55f74e70 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Jan 2020 02:21:14 +0000 Subject: [PATCH] Align cformat rules with current CI implementation (#7936) * Align cformat rules with current CI implementation * Optimise file walking --- lib/python/qmk/cli/cformat.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/python/qmk/cli/cformat.py b/lib/python/qmk/cli/cformat.py index 17ca91b3b..fe1edef60 100644 --- a/lib/python/qmk/cli/cformat.py +++ b/lib/python/qmk/cli/cformat.py @@ -24,13 +24,14 @@ def cformat(cli): if cli.args.files: cli.args.files = [os.path.join(os.environ['ORIG_CWD'], file) for file in cli.args.files] else: + ignores = ['tmk_core/protocol/usb_hid', 'quantum/template'] for dir in ['drivers', 'quantum', 'tests', 'tmk_core']: for dirpath, dirnames, filenames in os.walk(dir): - if 'tmk_core/protocol/usb_hid' in dirpath: - continue + if any(i in dirpath for i in ignores): + dirnames.clear() for name in filenames: - if name.endswith('.c') or name.endswith('.h') or name.endswith('.cpp'): + if name.endswith(('.c', '.h', '.cpp')): cli.args.files.append(os.path.join(dirpath, name)) # Run clang-format on the files we've found