Align cformat rules with current CI implementation (#7936)
authorJoel Challis <git@zvecr.com>
Wed, 22 Jan 2020 02:21:14 +0000 (02:21 +0000)
committerDrashna Jaelre <drashna@live.com>
Wed, 22 Jan 2020 02:21:14 +0000 (18:21 -0800)
* Align cformat rules with current CI implementation

* Optimise file walking

lib/python/qmk/cli/cformat.py

index 17ca91b..fe1edef 100644 (file)
@@ -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