Update watcher.py

watcher.py

@@ -2,6 +2,7 @@ import os
 import re
 import time
 import json
+import subprocess
 import requests
 from datetime import datetime, timezone
 from bs4 import BeautifulSoup
@@ -18,7 +19,7 @@ PARAMS = {
 
 X_ACCOUNT = os.getenv("channeliotokenbot2")
 if not X_ACCOUNT:
-    raise RuntimeError("環境変数 channeliotokenbot2 が設定されていません")
+    raise RuntimeError("環境変数 channeliotokenokenbot2 が設定されていません")
 
 HEADERS_GET = {
     "accept": "application/json",
@@ -35,8 +36,11 @@ HEADERS_POST = {
 
 # ===== ssyoutube =====
 SSYOUTUBE_URL = "https://ssyoutube.online/yt-video-detail/"
-SSYOUTUBE_MERGE_URL = "https://ssyoutube.online/wp-admin/admin-ajax.php"
-SSYOUTUBE_NONCE = "82b3e4b0cd"  # 必要に応じて変更
+
+# ===== tfLink クライアント =====
+from tflink import TFLinkClient
+
+tf_client = TFLinkClient()  # 匿名アップロード
 
 # ===== Utils =====
 def parse_updated_at(value):
@@ -76,36 +80,78 @@ 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
 
         results.append({
             "url": url,
-            "quality": quality or "audio",
+            "quality": quality,
             "has_audio": has_audio,
         })
 
     return results
 
-def build_links(items):
+# ===== 動画と音声の選別 =====
+def choose_best_streams(items):
+    # 映像 + 音声付きは優先しない
+    video_only = []
+    audio_only = []
+
+    for item in items:
+        if item["has_audio"] == "false":
+            # 映像のみ
+            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)
+
+# ===== 結合 =====
+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
+
+# ===== 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"]
-        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>'
+        line = f'<link type="url" value="{url}"> {quality}</link>'
         lines.append(line)
 
+    lines.append(f"結合ファイルダウンロード: {upload_link}")
     return "\n".join(lines)
 
 def send_to_channel(text):
@@ -132,43 +178,6 @@ def send_to_channel(text):
     )
     res.raise_for_status()
 
-# ===== 動画 + 音声結合 =====
-def merge_video_audio(video_url, audio_url, output_name):
-    payload = {
-        "action": "process_video_merge",
-        "nonce": SSYOUTUBE_NONCE,
-        "request_data": json.dumps({
-            "id": f"{output_name}_merge",
-            "ttl": 3600000,
-            "inputs": [
-                {"url": audio_url, "ext": "mp4"},
-                {"url": video_url, "ext": "mp4"}
-            ],
-            "output": {
-                "ext": "mp4",
-                "downloadName": f"{output_name}.mp4",
-                "chunkUpload": {"size": 104857600, "concurrency": 3}
-            },
-            "operation": {"type": "replace_audio_in_video"}
-        })
-    }
-
-    res = requests.post(
-        SSYOUTUBE_MERGE_URL,
-        data=payload,
-        headers={
-            "User-Agent": "Mozilla/5.0",
-            "Referer": "https://ssyoutube.online/yt-video-detail/"
-        },
-        timeout=30
-    )
-    res.raise_for_status()
-    result = res.json().get("data", {}).get("result", {})
-    monitor_url = result.get("monitor", {}).get("http")
-    if not monitor_url:
-        raise RuntimeError("動画結合 API が返す monitor URL が取得できませんでした")
-    return monitor_url
-
 # ===== Main =====
 def main():
     while True:
@@ -214,22 +223,39 @@ def main():
 
             items = fetch_download_links(youtube_url)
             if not items:
-                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"]
+            video_stream, audio_stream = choose_best_streams(items)
+            if not video_stream or not audio_stream:
+                print("映像または音声ストリームが足りません")
+                time.sleep(10)
+                continue
+
+            # ダウンロードして結合
+            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("結合失敗")
+                time.sleep(10)
+                continue
 
-            if video_items and audio_items:
-                # 最も高画質な動画
-                video_item = sorted(video_items, key=lambda x: int(re.sub(r"\D", "", x["quality"] or "0")), reverse=True)[0]
-                audio_item = audio_items[0]
-                merged_url = merge_video_audio(video_item["url"], audio_item["url"], f"yt_{youtube_id}")
-                items.append({"url": merged_url, "quality": "merged", "has_audio": "true"})
+            # tfLink アップロード
+            upload_link = upload_to_tflink(merged)
 
-            message_text = build_links(items)
+            message_text = build_links(items, upload_link)
             send_to_channel(message_text)
             print("送信完了")