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

- momo の実装を参考にサブコマンド形式に変更
- build コマンド: 既存のビルド機能を _build 関数に移動
- format コマンド: clang-format を使用したコードフォーマット機能を追加
- clang-format の自動検出機能を実装（clang-format-14 から clang-format-50 まで検索）
- ソースファイルの import 順序を自動整理

Author: voluntas

run.py

@@ -1,4 +1,5 @@
 import argparse
+import glob
 import logging
 import multiprocessing
 import os
@@ -209,22 +210,39 @@ def install_deps(
         install_openh264(**install_openh264_args)
 
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "target", choices=["macos_arm64", "ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"]
-    )
-    parser.add_argument("--debug", action="store_true")
-    parser.add_argument("--relwithdebinfo", action="store_true")
-    parser.add_argument("--local-webrtc-build-dir", type=os.path.abspath)
-    parser.add_argument("--local-webrtc-build-args", default="", type=shlex.split)
-    parser.add_argument("--local-sora-cpp-sdk-dir", type=os.path.abspath)
-    parser.add_argument("--local-sora-cpp-sdk-args", default="", type=shlex.split)
-    parser.add_argument("--package", action="store_true")
+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()
 
-    platform = args.target
+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/**/*.h",
+        "src/**/*.cpp",
+    ]
+    target_files = []
+    for pattern in patterns:
+        files = glob.glob(pattern, recursive=True)
+        target_files.extend(files)
+    if target_files:
+        cmd([clang_format_path, "-i"] + target_files)
+
+
+def _build(args):
+
+    target = args.target
+    platform = target
     configuration_dir = "debug" if args.debug else "release"
     source_dir = os.path.join(BASE_DIR, "_source", platform, configuration_dir)
     build_dir = os.path.join(BASE_DIR, "_build", platform, configuration_dir)
@@ -322,5 +340,36 @@ def main():
                 f.write(f"PACKAGE_NAME={archive_name}\n")
 
 
+def main():
+    parser = argparse.ArgumentParser()
+    sp = parser.add_subparsers(dest="command")
+
+    # build コマンド
+    bp = sp.add_parser("build")
+    bp.add_argument(
+        "target", choices=["macos_arm64", "ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"]
+    )
+    bp.add_argument("--debug", action="store_true")
+    bp.add_argument("--relwithdebinfo", action="store_true")
+    bp.add_argument("--local-webrtc-build-dir", type=os.path.abspath)
+    bp.add_argument("--local-webrtc-build-args", default="", type=shlex.split)
+    bp.add_argument("--local-sora-cpp-sdk-dir", type=os.path.abspath)
+    bp.add_argument("--local-sora-cpp-sdk-args", default="", type=shlex.split)
+    bp.add_argument("--package", 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/nop_video_decoder.cpp

@@ -3,11 +3,11 @@
 // WebRTC
 #include <api/video/i420_buffer.h>
 #include <media/base/media_constants.h>
-#include <modules/video_coding/include/video_error_codes.h>
 #include <modules/video_coding/codecs/av1/libaom_av1_encoder.h>
 #include <modules/video_coding/codecs/h264/include/h264.h>
 #include <modules/video_coding/codecs/vp8/include/vp8.h>
 #include <modules/video_coding/codecs/vp9/include/vp9.h>
+#include <modules/video_coding/include/video_error_codes.h>
 
 bool NopVideoDecoder::Configure(const Settings& settings) {
   return true;

src/virtual_client.h

@@ -76,8 +76,8 @@ class VirtualClient : public std::enable_shared_from_this<VirtualClient>,
   void OnPush(std::string text) override {}
   void OnMessage(std::string label, std::string data) override {}
 
-  void OnTrack(webrtc::scoped_refptr<webrtc::RtpTransceiverInterface> transceiver)
-      override {}
+  void OnTrack(webrtc::scoped_refptr<webrtc::RtpTransceiverInterface>
+                   transceiver) override {}
   void OnRemoveTrack(
       webrtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver) override {}
 

src/zakuro.cpp

@@ -437,8 +437,10 @@ int Zakuro::Run() {
   // signaling URL のバリデーション
   for (const auto& url : config_.sora_signaling_urls) {
     if (url.find("wss://") != 0 && url.find("ws://") != 0) {
-      std::cerr << "[" << config_.name << "] Error: Invalid signaling URL: " << url << std::endl;
-      std::cerr << "Signaling URL must start with 'ws://' or 'wss://'" << std::endl;
+      std::cerr << "[" << config_.name
+                << "] Error: Invalid signaling URL: " << url << std::endl;
+      std::cerr << "Signaling URL must start with 'ws://' or 'wss://'"
+                << std::endl;
       return 1;
     }
   }

src/zakuro_audio_device_module.h

@@ -10,8 +10,8 @@
 #include <vector>
 
 // webrtc
-#include "api/make_ref_counted.h"
 #include "api/environment/environment_factory.h"
+#include "api/make_ref_counted.h"
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "rtc_base/ref_counted_object.h"
@@ -39,7 +39,6 @@ struct ZakuroAudioDeviceModuleConfig {
   std::function<void(std::vector<int16_t>&)> render;
   int sample_rate;
   int channels;
-
 };
 
 class ZakuroAudioDeviceModule : public webrtc::AudioDeviceModule {