Update watcher.py

watcher.py

@@ -2,6 +2,9 @@ import os
 import re
 import time
 import json
+import shutil
+import tempfile
+import subprocess
 import requests
 from datetime import datetime, timezone
 from bs4 import BeautifulSoup
@@ -74,8 +77,8 @@ def fetch_download_links(youtube_url):
     results = []
     for btn in buttons:
         url = btn.get("data-url")
-        quality = btn.get("data-quality")  # 例: 1080p / 720p / None
-        has_audio = btn.get("data-has-audio")  # "true" / "false" / None
+        quality = btn.get("data-quality")
+        has_audio = btn.get("data-has-audio")
 
         if not url:
             continue
@@ -88,38 +91,62 @@ def fetch_download_links(youtube_url):
 
     return results
 
-def build_links(items):
-    lines = []
-    for item in items:
-        url = item["url"]
-        quality = item["quality"]
-        has_audio = item["has_audio"]
-
-        audio_label = ""
-        if has_audio == "false":
-            audio_label = "（映像のみ）"
-        elif has_audio == "true":
-            audio_label = "（音声付き）"
-
-        line = f'<link type="url" value="{url}"> {quality} {audio_label}</link>'
-        lines.append(line)
+# ===== 最高画質映像 + 音声を選択 =====
+def select_best_video_and_audio(items):
+    video_items = []
+    audio_item = None
 
-    return "\n".join(lines)
+    for item in items:
+        if item["quality"] == "audio":
+            audio_item = item
+        elif item["has_audio"] == "false":
+            m = re.match(r"(\d+)p", item["quality"])
+            if m:
+                video_items.append((int(m.group(1)), item))
+
+    if not video_items or not audio_item:
+        return None, None
+
+    video_items.sort(key=lambda x: x[0], reverse=True)
+    return video_items[0][1], audio_item
+
+# ===== ファイルダウンロード =====
+def download_file(url, path):
+    with requests.get(url, stream=True, timeout=60) as r:
+        r.raise_for_status()
+        with open(path, "wb") as f:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+
+# ===== ffmpeg 結合 =====
+def merge_video_audio(video_path, audio_path, output_path):
+    cmd = [
+        "ffmpeg",
+        "-y",
+        "-i", video_path,
+        "-i", audio_path,
+        "-c:v", "copy",
+        "-c:a", "aac",
+        output_path
+    ]
+    subprocess.run(cmd, check=True)
+
+# ===== file.io アップロード =====
+def upload_to_fileio(file_path):
+    with open(file_path, "rb") as f:
+        r = requests.post("https://file.io", files={"file": f}, timeout=60)
+    r.raise_for_status()
+    data = r.json()
+    if not data.get("success"):
+        raise RuntimeError("file.io アップロード失敗")
+    return data["link"]
 
 def send_to_channel(text):
     payload = {
         "requestId": f"desk-web-{int(time.time() * 1000)}",
         "blocks": [
-            {
-                "type": "text",
-                "value": text
-            }
+            {"type": "text", "value": text}
         ],
-        "buttons": None,
-        "form": None,
-        "webPage": None,
-        "files": None,
-        "customPayload": None
     }
 
     res = requests.post(
@@ -165,23 +192,33 @@ def main():
                 time.sleep(10)
                 continue
 
-            text = latest_msg["plainText"]
-            youtube_id = extract_youtube_id(text)
+            youtube_id = extract_youtube_id(latest_msg["plainText"])
             if not youtube_id:
                 time.sleep(10)
                 continue
 
             youtube_url = f"https://www.youtube.com/watch?v={youtube_id}"
-
             items = fetch_download_links(youtube_url)
-            if not items:
-                print("ダウンロードリンクが取得できませんでした")
+
+            video_item, audio_item = select_best_video_and_audio(items)
+            if not video_item:
                 time.sleep(10)
                 continue
 
-            message_text = build_links(items)
-            send_to_channel(message_text)
-            print("送信完了")
+            with tempfile.TemporaryDirectory() as tmp:
+                video_path = os.path.join(tmp, "video.mp4")
+                audio_path = os.path.join(tmp, "audio.m4a")
+                output_path = os.path.join(tmp, "merged.mp4")
+
+                download_file(video_item["url"], video_path)
+                download_file(audio_item["url"], audio_path)
+
+                merge_video_audio(video_path, audio_path, output_path)
+
+                link = upload_to_fileio(output_path)
+                send_to_channel(f"🎬 結合済み動画（最高画質）\n{link}")
+
+                print("送信完了:", link)
 
         except Exception as e:
             print("エラー:", e)
@@ -189,4 +226,4 @@ def main():
         time.sleep(15)
 
 if __name__ == "__main__":
-    main()
+    main()