PRESUBMIT.cfg: Add cros format

- This and black does the same thing. Remove black.
- C/C++ is covered by clang_format_check for now.
- This also covers Bazel BUILD files.

BUG=b:245439871
TEST=repo upload

Change-Id: Ib42aaa3fd410898bbe08336e34d96f390380cbe1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/4224854
Reviewed-by: Chih-Yang Hsia <[email protected]>
Commit-Queue: Chih-Yang Hsia <[email protected]>
Commit-Queue: Li-Yu Yu <[email protected]>
Auto-Submit: Li-Yu Yu <[email protected]>
Tested-by: Li-Yu Yu <[email protected]>

Author: afq984

LICENSE

@@ -1,4 +1,4 @@
- Copyright 2021 The ChromiumOS Authors
+Copyright 2021 The ChromiumOS Authors
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are

LICENSE.DBUS

@@ -171,40 +171,40 @@ license without modification. This license may not be modified without
 the express written permission of its copyright owner.
 
 
--- 
-END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential 
-differences between the Academic Free License (AFL) version 1.0 and other 
+--
+END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential
+differences between the Academic Free License (AFL) version 1.0 and other
 open source licenses:
 
-The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache 
-licenses in many respects but it is intended to solve a few problems with 
+The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache
+licenses in many respects but it is intended to solve a few problems with
 those licenses.
-    
-* The AFL is written so as to make it clear what software is being 
-licensed (by the inclusion of a statement following the copyright notice 
-in the software). This way, the license functions better than a template 
+
+* The AFL is written so as to make it clear what software is being
+licensed (by the inclusion of a statement following the copyright notice
+in the software). This way, the license functions better than a template
 license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software.
-    
-* The AFL contains a complete copyright grant to the software. The BSD 
+
+* The AFL contains a complete copyright grant to the software. The BSD
 and Apache licenses are vague and incomplete in that respect.
-    
-* The AFL contains a complete patent grant to the software. The BSD, MIT, 
-UoI/NCSA and Apache licenses rely on an implied patent license and contain 
+
+* The AFL contains a complete patent grant to the software. The BSD, MIT,
+UoI/NCSA and Apache licenses rely on an implied patent license and contain
 no explicit patent grant.
-    
-* The AFL makes it clear that no trademark rights are granted to the 
-licensor's trademarks. The Apache license contains such a provision, but the 
+
+* The AFL makes it clear that no trademark rights are granted to the
+licensor's trademarks. The Apache license contains such a provision, but the
 BSD, MIT and UoI/NCSA licenses do not.
-    
-* The AFL includes the warranty by the licensor that it either owns the 
-copyright or that it is distributing the software under a license. None of 
-the other licenses contain that warranty. All other warranties are disclaimed, 
+
+* The AFL includes the warranty by the licensor that it either owns the
+copyright or that it is distributing the software under a license. None of
+the other licenses contain that warranty. All other warranties are disclaimed,
 as is the case for the other licenses.
 
-* The AFL is itself copyrighted (with the right granted to copy and distribute 
-without modification). This ensures that the owner of the copyright to the 
-license will control changes. The Apache license contains a copyright notice, 
-but the BSD, MIT and UoI/NCSA licenses do not. 
+* The AFL is itself copyrighted (with the right granted to copy and distribute
+without modification). This ensures that the owner of the copyright to the
+license will control changes. The Apache license contains a copyright notice,
+but the BSD, MIT and UoI/NCSA licenses do not.
 --
 START OF GNU GENERAL PUBLIC LICENSE
 --
@@ -267,7 +267,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -322,7 +323,8 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -380,7 +382,8 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -437,7 +440,8 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -490,7 +494,8 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

PRESUBMIT.cfg

@@ -1,12 +1,12 @@
 [Hook Scripts]
 xmllint: cras/dbus_bindings/xmllint.py --ignore-non-dbus-xml-files ${PRESUBMIT_FILES}
 check-include-guards: devtools/check-include-guards.py ${PRESUBMIT_FILES}
+cros format: cros format --exclude="*.c" --exclude="*.cc" --exclude="*.h" -- ${PRESUBMIT_FILES}
 
 [Hook Overrides]
 tab_check: false
 clang_format_check: true
 cargo_clippy_check: true
-black_check: true
 
 # On by default, but required for options below.
 cros_license_check: true
@@ -26,5 +26,7 @@ cargo_clippy_check:
   --project=cras/client/cras_tests
   --project=cras/client/libcras
 long_line_check:
+  --exclude_regex=.*\.py$
+  --exclude_regex=^cras/scripts/asoc_dapm_graph$
   --exclude_regex=.+\.policy
   --exclude_regex=.*\.[ch]$

cras/client/cras-sys/Cargo.toml

@@ -14,4 +14,3 @@ serde = "1.0.125"
 [patch.crates-io] # ignored by ebuild
 audio_streams = { path = "../../../../../../chroot/usr/lib/cros_rust_registry/registry/audio_streams-0.1.0/" } # ignored by ebuild
 data_model = { path = "../../../../../../chroot/usr/lib/cros_rust_registry/registry/data_model-0.1.50/" } # ignored by ebuild
-

cras/client/cras-sys/src/lib.rs

@@ -446,7 +446,11 @@ impl fmt::Display for AudioDevDebugInfo {
         writeln!(f, "  Frame rate: {}", self.frame_rate)?;
         writeln!(f, "  Number of channels: {}", self.num_channels)?;
         writeln!(f, "  Estimated rate ratio: {:.2}", self.est_rate_ratio)?;
-        writeln!(f, "  Estimated rate ratio: {:.2}", self.est_rate_ratio_when_underrun)?;
+        writeln!(
+            f,
+            "  Estimated rate ratio: {:.2}",
+            self.est_rate_ratio_when_underrun
+        )?;
         writeln!(f, "  Underrun count: {}", self.num_underruns)?;
         writeln!(f, "  Severe underrun count: {}", self.num_severe_underruns)?;
         writeln!(f, "  Highest hardware level: {}", self.highest_hw_level)?;

cras/dbus_bindings/xmllint.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env vpython3
-
 # Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

cras/rules_rust_stub/WORKSPACE.bazel

@@ -1,4 +1,3 @@
 # Copyright 2023 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-

cras/rules_rust_stub/crate_universe/BUILD.bazel

@@ -1,4 +1,3 @@
 # Copyright 2023 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-

cras/rules_rust_stub/rust/BUILD.bazel

@@ -1,4 +1,3 @@
 # Copyright 2023 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-

cras/scripts/asoc_dapm_graph

@@ -10,85 +10,87 @@ To generate widget status for a device run
 """
 
 from __future__ import print_function
+
 import os
 import platform
 import re
 import sys
 import time
 
+
 ROOTDIR = '/sys/kernel/debug/asoc/'
 # Some widget names are widely used by many codecs, adding them to the graph
 # creates a mess.
 IGNORE_WIDGETS = ('Playback', 'Capture', 'bias_level')
 
 
 def handle_widgets(path):
-  """Reads DAPM widget information from sysfs and generates dot graph entry.
+    """Reads DAPM widget information from sysfs and generates dot graph entry.
 
-  Args:
-    path: path for sysfs file that exports information about DAPM widget.
-  """
-  for w in os.listdir(path):
-    if w in IGNORE_WIDGETS:
-      continue
+    Args:
+      path: path for sysfs file that exports information about DAPM widget.
+    """
+    for w in os.listdir(path):
+        if w in IGNORE_WIDGETS:
+            continue
 
-    with open(os.path.join(path, w)) as f:
-      lines = f.readlines()
+        with open(os.path.join(path, w)) as f:
+            lines = f.readlines()
 
-    active = lines[0].startswith(w + ': On ')
-    color = 'green' if active else 'red'
-    print('\t"%s" [color = %s]' % (w, color))
+        active = lines[0].startswith(w + ': On ')
+        color = 'green' if active else 'red'
+        print('\t"%s" [color = %s]' % (w, color))
 
-    for l in lines[1:]:
-      l = l.rstrip()
-      # The string format is (in/out) "switch" "widget".
-      edge = list(filter(None, re.split(r' (in|out)  "(.+)" "(.+)"', l)))
+        for l in lines[1:]:
+            l = l.rstrip()
+            # The string format is (in/out) "switch" "widget".
+            edge = list(filter(None, re.split(r' (in|out)  "(.+)" "(.+)"', l)))
 
-      if len(edge) != 3:
-        continue
+            if len(edge) != 3:
+                continue
 
-      direction = edge[0]
-      source = edge[2]
+            direction = edge[0]
+            source = edge[2]
 
-      if source in IGNORE_WIDGETS:
-        continue
+            if source in IGNORE_WIDGETS:
+                continue
 
-      # We need to output the edge only once (e.g. inbound).
-      if direction != 'in':
-        continue
+            # We need to output the edge only once (e.g. inbound).
+            if direction != 'in':
+                continue
 
-      print('\t"%s" -> "%s"' % (source, w))
+            print('\t"%s" -> "%s"' % (source, w))
 
 
 def handle_card(path):
-  """Generates dot graph file for the given card.
-
-  Args:
-    path: path to sysfs directory that exports DAPM information for a sound card.
-  """
-  host = platform.uname()[1]
-  print('// Generated %s at %s.' % (time.strftime("%c"), host))
-  print('// To visualize the graph run "dot -Kfdp -Tpng $SCRIPT_OUTPUT_FILE -o widgets.png".')
-  print('digraph G {')
-  print('\tbgcolor = grey')
-  for root, dirs, files in os.walk(path):
-    if 'dapm' in dirs:
-      handle_widgets(os.path.join(root, 'dapm'))
-      dirs.remove('dapm')
-  print('}')
+    """Generates dot graph file for the given card.
+
+    Args:
+      path: path to sysfs directory that exports DAPM information for a sound card.
+    """
+    host = platform.uname()[1]
+    print('// Generated %s at %s.' % (time.strftime("%c"), host))
+    print('// To visualize the graph run "dot -Kfdp -Tpng $SCRIPT_OUTPUT_FILE -o widgets.png".')
+    print('digraph G {')
+    print('\tbgcolor = grey')
+    for root, dirs, files in os.walk(path):
+        if 'dapm' in dirs:
+            handle_widgets(os.path.join(root, 'dapm'))
+            dirs.remove('dapm')
+    print('}')
 
 
 def main(argv):
-  for c in os.listdir(ROOTDIR):
-    path = os.path.join(ROOTDIR, c)
-    # We assume that directories in ROOTDIR are cards.
-    if os.path.isdir(path):
-      handle_card(path)
-      sys.exit(0)
+    for c in os.listdir(ROOTDIR):
+        path = os.path.join(ROOTDIR, c)
+        # We assume that directories in ROOTDIR are cards.
+        if os.path.isdir(path):
+            handle_card(path)
+            sys.exit(0)
 
-  print('No cards found', file=sys.stderr)
-  sys.exit(1)
+    print('No cards found', file=sys.stderr)
+    sys.exit(1)
 
 
 if __name__ == '__main__':
-  main(sys.argv[1:])
+    main(sys.argv[1:])

cras/src/plc/parse_sco.py

@@ -2,6 +2,7 @@
 # Copyright 2020 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
 """
 A script to extract raw SCO RX packets from btsnoop.
 Use 'btmon -S' to dump SCO traffic from btsnoop file.

cras/src/tests/.clang-format

@@ -11,4 +11,3 @@ ForEachMacros:
   - 'DL_FOREACH_INTERNAL'
   - 'LL_FOREACH'
   - 'LL_FOREACH_SAFE'
-

cras/src/tests/audio_test_gui.py

@@ -1,14 +1,16 @@
 #!/usr/bin/env python
-#
 # Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
 """Script functions as a web app and wrapper for the cras_router program."""
 
 import re
 import subprocess
+
 import cherrypy
 
+
 # Node Format: [Stable_Id, ID, Vol/Gain, UI, Plugged, L/R_swapped, Time,
 #               Hotword, Type, MaxCha, Name]
 ID_INDEX = 1

cras/tools/create_volume_curve.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-#
 # Copyright 2012 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

cras/tools/generate_dbus_bindings_h.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-#
 # Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

cros_alsa/Cargo.toml

@@ -10,4 +10,4 @@ alsa-sys = "0.2.0"
 cros_alsa_derive = { path = "cros_alsa_derive" } # provided by ebuild
 libc = "0.2.65"
 log = "0.4"
-remain = "0.2.1"
+remain = "0.2.1"

devtools/audio_thread_log_viewer/viewer_c3.py

@@ -1,9 +1,7 @@
 #!/usr/bin/python
-#
 # Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-#
 
 """Generates an HTML file with plot of buffer level in the audio thread log."""
 
@@ -13,6 +11,7 @@
 import string
 import time
 
+
 page_content = string.Template(
     """
 <html meta charset="UTF8">

devtools/audio_tuning/conf2ini.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-#
 # Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -18,6 +17,7 @@
 import sys
 from typing import List
 
+
 biquad_type_name = [
     "none",
     "lowpass",

devtools/audio_tuning/conf2ini2.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-#
 # Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

devtools/check-include-guards.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-
 # Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -10,8 +9,8 @@
 # instead.
 
 import os
-import sys
 import string
+import sys
 
 
 fail = False

devtools/ini_editor.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-#
 # Copyright 2014 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -12,12 +11,13 @@
 """
 
 import argparse
+from collections import namedtuple
+import io
 import logging
 import os
 import re
-import io
 import sys
-from collections import namedtuple
+
 
 Parameter = namedtuple('Parameter', ['value', 'comment'])
 

devtools/ini_editor_unittest.py

@@ -3,7 +3,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-
 """Unittest for ini_editor.py."""
 
 
@@ -15,6 +14,7 @@
 
 from ini_editor import Ini
 
+
 SAMPLE_INI = """\
 [output_source]
 library=builtin

devtools/ucmlint/draft_comments.py

@@ -1,17 +1,16 @@
 #!/usr/bin/env python3
-#
 # Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
+import http.cookiejar
+import http.cookies
+import json
 import logging
 import os
-import json
-import urllib.request
 import urllib.parse
-import http.cookies
-import http.cookiejar
+import urllib.request
 
 import lint_cl
 

devtools/ucmlint/lint_cl.py

@@ -1,20 +1,19 @@
 #!/usr/bin/env python3
-#
 # Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
+import http.client
+import json
 import logging
+import os
+import re
 import subprocess
-import http.client
 import tempfile
-import re
 from typing import Optional, Union
-import urllib.request
 import urllib.parse
-import json
-import os
+import urllib.request
 
 import ucmlint
 

devtools/ucmlint/ucmlint.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-#
 # Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -10,14 +9,14 @@
 
 from __future__ import annotations
 
+import argparse
 import collections
+import dataclasses
 import difflib
+import enum
+import logging
 import os
 import pathlib
-import argparse
-import logging
-import enum
-import dataclasses
 from typing import List, Optional
 
 

devtools/vscode_remote_gdb_server.py

@@ -3,14 +3,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import sys
 import argparse
 import json
 import os
 from pathlib import Path
+import sys
 
-from chromite.lib import toolchain
 from chromite.lib import remote_access
+from chromite.lib import toolchain
 
 
 class VscodeConfig:

sound_card_init/seccomp/sound_card_init-seccomp-arm64.policy

@@ -51,4 +51,4 @@ socket: arg0 == AF_UNIX
 socketpair: 1
 statx: 1
 tgkill: 1
-write: 1
+write: 1