Update watcher.py

watcher.py

@@ -97,32 +97,35 @@ def fetch_download_links(youtube_url):
 
 # ===== 動画と音声の選別 =====
 def choose_best_streams(items):
-    # 映像 + 音声付きは優先しない
     video_only = []
     audio_only = []
 
     for item in items:
-        if item["has_audio"] == "false":
-            # 映像のみ
+        url = item["url"]
+        quality = item["quality"] or ""
+        has_audio = item["has_audio"]
+
+        if url.endswith(".m4a") or "audio" in quality.lower():
+            audio_only.append(item)
+        else:
             video_only.append(item)
-        elif item["has_audio"] == "true":
-            # 音声付き（どちらでも使える）
-            # 映像付きか音声のみか
-            if item["quality"] and "p" in item["quality"]:
-                # これは映像 + 音声付き
-                video_only.append(item)
-            else:
-                audio_only.append(item)
-
-    # 映像は最高画質
-    video = sorted(video_only,
-                   key=lambda x: int(re.sub(r"[^\d]", "", x["quality"] or "0")),
-                   reverse=True)
-    audio = sorted(audio_only,
-                   key=lambda x: int(re.sub(r"[^\d]", "", x["quality"] or "0")),
-                   reverse=True)
-
-    return (video[0] if video else None, audio[0] if audio else None)
+
+    if not video_only:
+        video = None
+    else:
+        video = sorted(video_only,
+                       key=lambda x: int(re.sub(r"[^\d]", "", x["quality"] or "0")),
+                       reverse=True)[0]
+
+    if not audio_only:
+        audio = None
+    else:
+        audio = sorted(audio_only,
+                       key=lambda x: int(re.sub(r"[^\d]", "", x["quality"] or "0")),
+                       reverse=True)[0]
+
+    return video, audio
+
 
 # ===== 結合 =====
 def merge_video_audio(video_url, audio_url, out_file):