run.py に build と format サブコマンドを追加

- momo を参考にして build と format サブコマンドを実装
- .github/workflows/build.yml のコマンドを新形式に変更
- opus_audio_decoder.cpp のコードフォーマットを修正

Author: voluntas

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
       - run: uv sync
       - name: Generate pyi
         run: |
-          uv run python run.py ubuntu-24.04_x86_64
+          uv run python run.py build ubuntu-24.04_x86_64
           mkdir libdatachannel/
           cp src/libdatachannel/py.typed libdatachannel/
           cp src/libdatachannel/libdatachannel_ext.pyi libdatachannel/
@@ -92,7 +92,7 @@ jobs:
           uv sync
 
       - run: |
-          uv run python run.py ${{ matrix.platform.target }}
+          uv run python run.py build ${{ matrix.platform.target }}
           uv run python -m build
 
       - run: |
@@ -150,7 +150,7 @@ jobs:
           uv sync
 
       - run: |
-          uv run python run.py ${{ matrix.platform.target }} --debug
+          uv run python run.py build ${{ matrix.platform.target }} --debug
           uv run python -m build --outdir dist_debug
         env:
           BUILD_PROFILE: debug
@@ -274,7 +274,7 @@ jobs:
       - run: |
           uv python pin ${{ matrix.python_version }}
           uv sync
-          uv run python run.py ${{ matrix.platform.target }} --debug
+          uv run python run.py build ${{ matrix.platform.target }} --debug
           uv run python -m build --outdir dist_debug
         env:
           BUILD_PROFILE: debug

CHANGES.md

@@ -16,6 +16,9 @@
 - [CHANGE] リリースを GH コマンドに変更
   - `gh release create` を使用してリリースを作成するように変更する
   - @voluntas
+- [CHANGE] run.py に build と format サブコマンドを追加
+  - .github/workflows/build.yml も修正
+  - @voluntas
 - [ADD] デバッグビルドの追加
   - ローカルバージョンラベル +debug を指定している
   - @voluntas

run.py

@@ -1,8 +1,10 @@
 import argparse
+import glob
 import multiprocessing
 import os
 import shutil
 import sys
+from typing import Optional
 
 from buildbase import (
     Platform,
@@ -179,29 +181,52 @@ def install_deps(
 ]
 
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--debug", action="store_true")
-    parser.add_argument("--relwithdebinfo", action="store_true")
-    parser.add_argument("target", choices=AVAILABLE_TARGETS)
+def _find_clang_binary(name: str) -> Optional[str]:
+    if shutil.which(name) is not None:
+        return name
+    else:
+        for n in range(50, 14, -1):
+            if shutil.which(f"{name}-{n}") is not None:
+                return f"{name}-{n}"
+    return None
 
-    args = parser.parse_args()
-    if args.target == "windows_x86_64":
+
+def _format(
+    clang_format_path: Optional[str] = None,
+):
+    if clang_format_path is None:
+        clang_format_path = _find_clang_binary("clang-format")
+    if clang_format_path is None:
+        raise Exception("clang-format not found. Please install it or specify the path.")
+    patterns = [
+        "src/**/*.cpp",
+        "src/**/*.h",
+    ]
+    target_files = []
+    for pattern in patterns:
+        files = glob.glob(pattern, recursive=True)
+        target_files.extend(files)
+    cmd([clang_format_path, "-i"] + target_files)
+
+
+def _build(args):
+    target = args.target
+    if target == "windows_x86_64":
         platform = Platform("windows", get_windows_osver(), "x86_64")
-    elif args.target == "macos_x86_64":
+    elif target == "macos_x86_64":
         platform = Platform("macos", get_macos_osver(), "x86_64")
-    elif args.target == "macos_arm64":
+    elif target == "macos_arm64":
         platform = Platform("macos", get_macos_osver(), "arm64")
-    elif args.target == "ubuntu-22.04_x86_64":
+    elif target == "ubuntu-22.04_x86_64":
         platform = Platform("ubuntu", "22.04", "x86_64")
-    elif args.target == "ubuntu-24.04_x86_64":
+    elif target == "ubuntu-24.04_x86_64":
         platform = Platform("ubuntu", "24.04", "x86_64")
-    elif args.target == "ubuntu-24.04_armv8":
+    elif target == "ubuntu-24.04_armv8":
         platform = Platform("ubuntu", "24.04", "armv8")
-    elif args.target == "ubuntu-22.04_armv8_jetson":
+    elif target == "ubuntu-22.04_armv8_jetson":
         platform = Platform("jetson", None, "armv8", "ubuntu-22.04")
     else:
-        raise Exception(f"Unknown target {args.target}")
+        raise Exception(f"Unknown target {target}")
 
     source_dir = os.path.join(BASE_DIR, "_source", platform.target.package_name)
     build_dir = os.path.join(BASE_DIR, "_build", platform.target.package_name)
@@ -341,5 +366,29 @@ def main():
                 )
 
 
+def main():
+    parser = argparse.ArgumentParser()
+    sp = parser.add_subparsers(dest="command")
+
+    # build コマンド
+    bp = sp.add_parser("build")
+    bp.add_argument("target", choices=AVAILABLE_TARGETS)
+    bp.add_argument("--debug", action="store_true")
+    bp.add_argument("--relwithdebinfo", action="store_true")
+
+    # format コマンド
+    fp = sp.add_parser("format")
+    fp.add_argument("--clang-format-path", type=str, default=None)
+
+    args = parser.parse_args()
+
+    if args.command == "build":
+        _build(args)
+    elif args.command == "format":
+        _format(clang_format_path=args.clang_format_path)
+    else:
+        parser.print_help()
+
+
 if __name__ == "__main__":
     main()

src/opus_audio_decoder.cpp

@@ -25,7 +25,8 @@ class OpusAudioDecoder : public AudioDecoder {
     }
 
     int error = 0;
-    decoder_ = opus_decoder_create(settings_.sample_rate, settings_.channels, &error);
+    decoder_ =
+        opus_decoder_create(settings_.sample_rate, settings_.channels, &error);
     if (error != OPUS_OK) {
       PLOG_ERROR << "Failed to create opus decoder";
       return false;
@@ -50,8 +51,9 @@ class OpusAudioDecoder : public AudioDecoder {
       return;
     }
 
-    int samples = opus_decode_float(decoder_, encoded.data.data(), encoded.data.shape(0),
-                                    pcm_buf_.data(), pcm_buf_.size() / settings_.channels, 0);
+    int samples = opus_decode_float(decoder_, encoded.data.data(),
+                                    encoded.data.shape(0), pcm_buf_.data(),
+                                    pcm_buf_.size() / settings_.channels, 0);
     if (samples < 0) {
       PLOG_ERROR << "Failed to opus_decode_float: result=" << samples;
       return;
@@ -62,19 +64,19 @@ class OpusAudioDecoder : public AudioDecoder {
     frame.sample_rate = settings_.sample_rate;
     frame.timestamp = encoded.timestamp;
     frame.pcm = CreatePCMFloat(samples, settings_.channels);
-    
+
     // PCMデータをコピー
     // frame.pcm.data() で生のポインタを取得
     float* pcm_data = static_cast<float*>(frame.pcm.data());
-    memcpy(pcm_data, pcm_buf_.data(), samples * settings_.channels * sizeof(float));
+    memcpy(pcm_data, pcm_buf_.data(),
+           samples * settings_.channels * sizeof(float));
 
     if (on_decode_) {
       on_decode_(frame);
     }
   }
 
-  void SetOnDecode(
-      std::function<void(const AudioFrame&)> on_decode) override {
+  void SetOnDecode(std::function<void(const AudioFrame&)> on_decode) override {
     on_decode_ = on_decode;
   }