Update watcher.py

watcher.py

@@ -2,10 +2,11 @@ import os
 import re
 import time
 import json
-import subprocess
 import requests
 from datetime import datetime, timezone
 from bs4 import BeautifulSoup
+import ffmpeg
+from tflink import TFLinkClient
 
 # ===== Channel.io 設定 =====
 GET_URL = "https://desk-api.channel.io/desk/channels/200605/groups/519217/messages"
@@ -19,7 +20,7 @@ PARAMS = {
 
 X_ACCOUNT = os.getenv("channeliotokenbot2")
 if not X_ACCOUNT:
-    raise RuntimeError("環境変数 channeliotokenokenbot2 が設定されていません")
+    raise RuntimeError("環境変数 channeliotokenbot2 が設定されていません")
 
 HEADERS_GET = {
     "accept": "application/json",
@@ -37,11 +38,6 @@ HEADERS_POST = {
 # ===== ssyoutube =====
 SSYOUTUBE_URL = "https://ssyoutube.online/yt-video-detail/"
 
-# ===== tfLink クライアント =====
-from tflink import TFLinkClient
-
-tf_client = TFLinkClient()  # 匿名アップロード
-
 # ===== Utils =====
 def parse_updated_at(value):
     if isinstance(value, (int, float)):
@@ -80,82 +76,41 @@ def fetch_download_links(youtube_url):
     results = []
     for btn in buttons:
         url = btn.get("data-url")
-        quality = btn.get("data-quality")
-        has_audio = btn.get("data-has-audio")
+        quality = btn.get("data-quality")  # 例: 1080p / 720p / None
+        has_audio = btn.get("data-has-audio")  # "true" / "false" / None
 
         if not url:
             continue
 
         results.append({
             "url": url,
-            "quality": quality,
+            "quality": quality or "audio",
             "has_audio": has_audio,
         })
 
     return results
 
-# ===== 動画と音声の選別 =====
-def choose_best_streams(items):
-    video_only = []
-    audio_only = []
-
-    for item in items:
-        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)
-
-    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):
-    cmd = [
-        "ffmpeg", "-y",
-        "-i", video_url,
-        "-i", audio_url,
-        "-c", "copy",
-        out_file,
-    ]
-    result = subprocess.run(cmd, capture_output=True)
-    if result.returncode != 0:
-        print("FFmpeg merge error:", result.stderr.decode())
-        return False
-    return True
+def download_file(url, filename):
+    with requests.get(url, stream=True) as r:
+        r.raise_for_status()
+        with open(filename, 'wb') as f:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+    return filename
+
+def merge_video_audio(video_file, audio_file, output_file):
+    (
+        ffmpeg
+        .input(video_file)
+        .output(audio_file, output_file, vcodec='copy', acodec='aac', strict='experimental')
+        .run(overwrite_output=True)
+    )
+    return output_file
 
-# ===== tfLink アップロード =====
 def upload_to_tflink(file_path):
-    res = tf_client.upload(file_path)
-    return res.download_link
-
-def build_links(items, upload_link):
-    lines = []
-    for item in items:
-        url = item["url"]
-        quality = item["quality"]
-        line = f'<link type="url" value="{url}"> {quality}</link>'
-        lines.append(line)
-
-    lines.append(f"結合ファイルダウンロード: {upload_link}")
-    return "\n".join(lines)
+    client = TFLinkClient()
+    result = client.upload(file_path)
+    return result.download_link
 
 def send_to_channel(text):
     payload = {
@@ -181,7 +136,6 @@ def send_to_channel(text):
     )
     res.raise_for_status()
 
-# ===== Main =====
 def main():
     while True:
         try:
@@ -226,41 +180,36 @@ def main():
 
             items = fetch_download_links(youtube_url)
             if not items:
+                print("ダウンロードリンクが取得できませんでした")
                 time.sleep(10)
                 continue
 
-            video_stream, audio_stream = choose_best_streams(items)
-            if not video_stream or not audio_stream:
-                print("映像または音声ストリームが足りません")
-                time.sleep(10)
-                continue
+            # ===== 最も高画質の動画と音声を選択 =====
+            video_items = [i for i in items if i["has_audio"] == "false"]
+            audio_items = [i for i in items if i["has_audio"] == "true" and i["quality"] == "audio"]
 
-            # ダウンロードして結合
-            temp_video = "video.mp4"
-            temp_audio = "audio.mp4"
-            merged = "merged_output.mp4"
-
-            # ダウンロード
-            with requests.get(video_stream["url"], stream=True) as r:
-                with open(temp_video, "wb") as f:
-                    for chunk in r.iter_content(chunk_size=8192):
-                        f.write(chunk)
-            with requests.get(audio_stream["url"], stream=True) as r:
-                with open(temp_audio, "wb") as f:
-                    for chunk in r.iter_content(chunk_size=8192):
-                        f.write(chunk)
-
-            if not merge_video_audio(temp_video, temp_audio, merged):
-                print("結合失敗")
+            if not video_items or not audio_items:
+                print("動画または音声が見つかりません")
                 time.sleep(10)
                 continue
 
-            # tfLink アップロード
-            upload_link = upload_to_tflink(merged)
+            # 解像度順にソートして最初を取得
+            video_items.sort(key=lambda x: int(re.sub(r"\D", "", x["quality"] or "0")), reverse=True)
+            video_url = video_items[0]["url"]
+            audio_url = audio_items[0]["url"]
+
+            video_file = download_file(video_url, "video.mp4")
+            audio_file = download_file(audio_url, "audio.m4a")
+            output_file = "merged.mp4"
+
+            merge_video_audio(video_file, audio_file, output_file)
+
+            # tflink にアップロード
+            tflink_url = upload_to_tflink(output_file)
 
-            message_text = build_links(items, upload_link)
+            message_text = f"結合動画のダウンロード: {tflink_url}"
             send_to_channel(message_text)
-            print("送信完了")
+            print("送信完了:", tflink_url)
 
         except Exception as e:
             print("エラー:", e)
@@ -268,4 +217,4 @@ def main():
         time.sleep(15)
 
 if __name__ == "__main__":
-    main()
+    main()