From e267bc526f619e3e18080686e7e83aac9967ebbf Mon Sep 17 00:00:00 2001 From: zvecr Date: Sun, 19 Jan 2020 00:04:19 +0000 Subject: [PATCH 1/2] Align cformat rules with current CI implementation --- lib/python/qmk/cli/cformat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python/qmk/cli/cformat.py b/lib/python/qmk/cli/cformat.py index 17ca91b3b508..1ea93e5feac8 100644 --- a/lib/python/qmk/cli/cformat.py +++ b/lib/python/qmk/cli/cformat.py @@ -26,7 +26,8 @@ def cformat(cli): else: for dir in ['drivers', 'quantum', 'tests', 'tmk_core']: for dirpath, dirnames, filenames in os.walk(dir): - if 'tmk_core/protocol/usb_hid' in dirpath: + ignores = ['tmk_core/protocol/usb_hid', 'quantum/template'] + if any(i in dirpath for i in ignores): continue for name in filenames: From 7b97f2d28dd6efbeb846d5948a158e1779165dd5 Mon Sep 17 00:00:00 2001 From: zvecr Date: Sun, 19 Jan 2020 17:32:17 +0000 Subject: [PATCH 2/2] Optimise file walking --- lib/python/qmk/cli/cformat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/python/qmk/cli/cformat.py b/lib/python/qmk/cli/cformat.py index 1ea93e5feac8..fe1edef60b83 100644 --- a/lib/python/qmk/cli/cformat.py +++ b/lib/python/qmk/cli/cformat.py @@ -24,14 +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): - ignores = ['tmk_core/protocol/usb_hid', 'quantum/template'] if any(i in dirpath for i in ignores): - continue + 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