Update watcher.py

watcher.py

@@ -35,6 +35,8 @@ 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"  # 必要に応じて変更
 
 # ===== Utils =====
 def parse_updated_at(value):
@@ -55,8 +57,8 @@ def extract_youtube_id(text):
             return m.group(1)
     return None
 
-# ===== ssyoutube HTML解析 & nonce取得 =====
-def fetch_download_links_and_nonce(youtube_url):
+# ===== ssyoutube HTML 解析 =====
+def fetch_download_links(youtube_url):
     res = requests.post(
         SSYOUTUBE_URL,
         data={"videoURL": youtube_url},
@@ -69,95 +71,25 @@ def fetch_download_links_and_nonce(youtube_url):
     res.raise_for_status()
 
     soup = BeautifulSoup(res.text, "lxml")
-
-    # ★ wp nonce 取得
-    nonce_el = soup.select_one('meta[name="wp-nonce"], input[name="nonce"]')
-    nonce = nonce_el["content"] if nonce_el and nonce_el.has_attr("content") else nonce_el["value"]
-
     buttons = soup.select("button[data-url]")
-    items = []
 
+    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
 
-        items.append({
+        results.append({
             "url": url,
-            "quality": quality,
+            "quality": quality or "audio",
             "has_audio": has_audio,
         })
 
-    return items, nonce
-
-def pick_best_video_and_audio(items):
-    video_candidates = []
-    audio_candidates = []
-
-    for item in items:
-        if item["has_audio"] == "false" and item["quality"]:
-            q = int(re.sub(r"\D", "", item["quality"]))
-            video_candidates.append((q, item))
-        if item["quality"] in (None, "audio"):
-            audio_candidates.append(item)
-
-    if not video_candidates or not audio_candidates:
-        return None, None
-
-    best_video = sorted(video_candidates, key=lambda x: x[0], reverse=True)[0][1]
-    best_audio = audio_candidates[0]
-
-    return best_video, best_audio
-
-def merge_video_audio(video, audio, nonce, youtube_id, quality):
-    ajax_url = "https://ssyoutube.online/wp-admin/admin-ajax.php"
-
-    request_data = {
-        "id": f"{youtube_id}_{quality}",
-        "ttl": 3600000,
-        "inputs": [
-            {
-                "url": audio["url"],
-                "ext": "mp4",
-                "chunkDownload": {"type": "header", "size": 52428800, "concurrency": 3}
-            },
-            {
-                "url": video["url"],
-                "ext": "mp4",
-                "chunkDownload": {"type": "header", "size": 52428800, "concurrency": 3}
-            }
-        ],
-        "output": {
-            "ext": "mp4",
-            "downloadName": f"{youtube_id}_{quality}.mp4",
-            "chunkUpload": {"size": 104857600, "concurrency": 3}
-        },
-        "operation": {"type": "replace_audio_in_video"}
-    }
-
-    files = {
-        "action": (None, "process_video_merge"),
-        "nonce": (None, nonce),
-        "request_data": (None, json.dumps(request_data)),
-    }
-
-    res = requests.post(ajax_url, files=files, timeout=30)
-    res.raise_for_status()
-    return res.json()
+    return results
 
-def wait_for_merge_done(monitor_http):
-    while True:
-        res = requests.get(monitor_http, timeout=15)
-        res.raise_for_status()
-        data = res.json()
-        if data["result"]["status"] == "done":
-            return data["result"]["output"]["url"]
-        time.sleep(5)
-
-# ===== Build & Send =====
 def build_links(items):
     lines = []
     for item in items:
@@ -179,7 +111,12 @@ def build_links(items):
 def send_to_channel(text):
     payload = {
         "requestId": f"desk-web-{int(time.time() * 1000)}",
-        "blocks": [{"type": "text", "value": text}],
+        "blocks": [
+            {
+                "type": "text",
+                "value": text
+            }
+        ],
         "buttons": None,
         "form": None,
         "webPage": None,
@@ -195,11 +132,53 @@ 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:
         try:
-            res = requests.get(GET_URL, headers=HEADERS_GET, params=PARAMS, timeout=30)
+            res = requests.get(
+                GET_URL,
+                headers=HEADERS_GET,
+                params=PARAMS,
+                timeout=30,
+            )
             res.raise_for_status()
 
             messages = res.json().get("messages", [])
@@ -209,6 +188,7 @@ def main():
             for msg in messages:
                 plain_text = msg.get("plainText")
                 updated_at = msg.get("updatedAt")
+
                 if not plain_text or updated_at is None:
                     continue
 
@@ -232,25 +212,24 @@ def main():
 
             youtube_url = f"https://www.youtube.com/watch?v={youtube_id}"
 
-            items, nonce = fetch_download_links_and_nonce(youtube_url)
+            items = fetch_download_links(youtube_url)
             if not items:
                 print("ダウンロードリンクが取得できませんでした")
                 time.sleep(10)
                 continue
 
-            video, audio = pick_best_video_and_audio(items)
-            if not video or not audio:
-                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"]
 
-            merge_res = merge_video_audio(video, audio, nonce, youtube_id, video["quality"])
-            monitor_http = merge_res["data"]["result"]["monitor"]["http"]
-            final_video_url = wait_for_merge_done(monitor_http)
+            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"})
 
             message_text = build_links(items)
-            message_text += f'\n<link type="url" value="{final_video_url}">🎬 音声付き {video["quality"]}</link>'
-
             send_to_channel(message_text)
             print("送信完了")