Update watcher.py

watcher.py

@@ -38,7 +38,6 @@ HEADERS_POST = {
 
 # ===== ssyoutube =====
 SSYOUTUBE_URL = "https://ssyoutube.online/yt-video-detail/"
-SSYOUTUBE_AJAX_URL = "https://ssyoutube.online/wp-admin/admin-ajax.php"
 
 # ===== Utils =====
 def parse_updated_at(value):
@@ -71,73 +70,65 @@ def fetch_download_links(youtube_url):
         }
     )
     res.raise_for_status()
-    return res.text
-
-# ===== 最高画質映像 + 音声を選択 =====
-def select_best_video_and_audio(html_content):
-    soup = BeautifulSoup(html_content, "lxml")
-    
-    # nonce を抽出
-    nonce_pattern = r"formData\.append\('nonce',\s*'([^']+)'\)"
-    nonce_match = re.search(nonce_pattern, html_content)
-    if not nonce_match:
-        raise ValueError("nonce が見つかりません")
-    nonce = nonce_match.group(1)
     
-    # 動画タイトルを抽出
-    title_elem = soup.select_one("h1.title")
-    video_title = title_elem.text.strip() if title_elem else "video"
+    # nonceを抽出
+    soup = BeautifulSoup(res.text, "lxml")
+    nonce_match = re.search(r"formData\.append\('nonce', '([^']+)'\);", res.text)
+    nonce = nonce_match.group(1) if nonce_match else None
     
-    # ボタンからURLと品質情報を取得
     buttons = soup.select("button[data-url]")
-    
-    video_items = []
-    audio_item = None
-    
+
+    results = []
     for btn in buttons:
         url = btn.get("data-url")
         quality = btn.get("data-quality")
         has_audio = btn.get("data-has-audio")
-        
+
         if not url:
             continue
-        
-        if quality == "audio":
-            audio_item = {
-                "url": url,
-                "quality": quality,
-                "has_audio": has_audio
-            }
-        elif has_audio == "false":
-            m = re.match(r"(\d+)p", quality)
+
+        results.append({
+            "url": url,
+            "quality": quality or "audio",
+            "has_audio": has_audio,
+        })
+
+    return results, nonce
+
+# ===== 最高画質映像 + 音声を選択 =====
+def select_best_video_and_audio(items):
+    video_items = []
+    audio_item = None
+
+    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({
-                    "quality": int(m.group(1)),
-                    "url": url,
-                    "data_quality": quality
-                })
-    
+                video_items.append((int(m.group(1)), item))
+
     if not video_items or not audio_item:
-        return None, None, None, None
-    
-    # 最高画質を選択
-    video_items.sort(key=lambda x: x["quality"], reverse=True)
-    best_video = video_items[0]
-    
-    return best_video, audio_item, nonce, video_title
+        return None, None
 
-# ===== サーバーサイド結合リクエスト =====
-def request_video_merge(youtube_id, video_item, audio_item, nonce, video_title):
-    # IDの生成（YouTubeID + 画質）
-    merge_id = f"{youtube_id}_{video_item['data_quality']}"
+    video_items.sort(key=lambda x: x[0], reverse=True)
+    return video_items[0][1], audio_item
+
+# ===== ssyoutube サーバー側結合 =====
+def merge_video_on_server(video_url, audio_url, video_id, quality, video_title, nonce):
+    """
+    ssyoutubeサーバーで動画と音声を結合する
+    """
+    # IDと画質からリクエストIDを生成
+    request_id = f"{video_id}_{quality}p"
     
     # リクエストデータの構築
     request_data = {
-        "id": merge_id,
+        "id": request_id,
         "ttl": 3600000,
         "inputs": [
             {
-                "url": video_item["url"],
+                "url": video_url,
                 "ext": "mp4",
                 "chunkDownload": {
                     "type": "header",
@@ -146,13 +137,13 @@ def request_video_merge(youtube_id, video_item, audio_item, nonce, video_title):
                 }
             },
             {
-                "url": audio_item["url"],
+                "url": audio_url,
                 "ext": "m4a"
             }
         ],
         "output": {
             "ext": "mp4",
-            "downloadName": f"{video_title}_{video_item['data_quality']}.mp4",
+            "downloadName": f"{video_title}_{quality}p.mp4",
             "chunkUpload": {
                 "size": 104857600,
                 "concurrency": 3
@@ -163,6 +154,7 @@ def request_video_merge(youtube_id, video_item, audio_item, nonce, video_title):
         }
     }
     
+    # 結合開始リクエスト
     payload = {
         "action": "process_video_merge",
         "nonce": nonce,
@@ -170,69 +162,56 @@ def request_video_merge(youtube_id, video_item, audio_item, nonce, video_title):
     }
     
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
-        "Origin": "https://ssyoutube.online",
+        "User-Agent": "Mozilla/5.0",
         "Referer": "https://ssyoutube.online/",
-        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
+        "Origin": "https://ssyoutube.online",
+        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
     }
     
-    response = requests.post(
-        SSYOUTUBE_AJAX_URL,
+    res = requests.post(
+        "https://ssyoutube.online/wp-admin/admin-ajax.php",
         data=payload,
         headers=headers,
         timeout=30
     )
-    response.raise_for_status()
+    res.raise_for_status()
     
-    result = response.json()
+    result = res.json()
     
     if not result.get("success") or not result.get("data", {}).get("success"):
-        raise RuntimeError(f"結合リクエストに失敗: {result}")
+        raise RuntimeError(f"結合開始に失敗しました: {result}")
     
-    # HTTP監視URLを取得
+    # ステータス監視用URLを取得
     monitor_url = result["data"]["result"]["monitor"]["http"]
-    return monitor_url
-
-# ===== 結合進捗監視 =====
-def monitor_merge_progress(monitor_url):
-    """結合進捗を監視し、完了したらダウンロードURLを返す"""
-    max_attempts = 300  # 最大試行回数（5分間）
+    
+    # 完了するまでポーリング
+    max_attempts = 60  # 最大60回試行（30秒間隔で約30分）
     attempt = 0
     
     while attempt < max_attempts:
-        try:
-            response = requests.get(monitor_url, timeout=30)
-            response.raise_for_status()
-            result = response.json()
-            
-            if not result.get("success"):
-                time.sleep(1)
-                attempt += 1
-                continue
-            
-            status = result["result"].get("status")
-            
-            if status == "done":
-                download_url = result["result"]["output"]["url"]
-                return download_url
-            elif status == "error":
-                error_msg = result["result"].get("error", "不明なエラー")
-                raise RuntimeError(f"結合処理でエラー: {error_msg}")
-            elif status in ["processing", "started"]:
-                # 進捗表示（オプション）
-                progress = result["result"].get("progress_in_percent", 0)
-                print(f"結合中... {progress}%")
-            
-            # 2秒待機
-            time.sleep(2)
-            attempt += 1
-            
-        except Exception as e:
-            print(f"監視中にエラー: {e}")
-            time.sleep(2)
-            attempt += 1
+        time.sleep(30)  # 30秒間隔でチェック
+        
+        status_res = requests.get(monitor_url, timeout=30)
+        status_res.raise_for_status()
+        status_data = status_res.json()
+        
+        if not status_data.get("success"):
+            raise RuntimeError(f"ステータス取得に失敗しました: {status_data}")
+        
+        status = status_data["result"]["status"]
+        
+        if status == "done":
+            # 完了したらダウンロードURLを返す
+            return status_data["result"]["output"]["url"]
+        elif status == "error":
+            error_msg = status_data["result"]["error"]
+            raise RuntimeError(f"結合処理でエラーが発生しました: {error_msg}")
+        # "processing" の場合は継続
+        
+        attempt += 1
+        print(f"結合処理中... 進捗: {status_data['result'].get('progress_in_percent', 0)}%")
     
-    raise TimeoutError("結合処理がタイムアウトしました")
+    raise RuntimeError("結合処理がタイムアウトしました")
 
 def send_to_channel(text):
     payload = {
@@ -265,76 +244,90 @@ def main():
             res.raise_for_status()
 
             messages = res.json().get("messages", [])
-            
+            latest_msg = None
+            latest_time = None
+
             for msg in messages:
                 msg_id = msg.get("id")
                 plain_text = msg.get("plainText")
                 updated_at = msg.get("updatedAt")
 
-                # 必須フィールドのチェック
-                if not msg_id or not plain_text or updated_at is None:
+                if not plain_text or updated_at is None:
                     continue
-                
+                    
                 # 既に処理済みのメッセージはスキップ
                 if msg_id in processed_messages:
                     continue
-                
-                # YouTube ID を抽出
-                youtube_id = extract_youtube_id(plain_text)
-                if not youtube_id:
+
+                t = parse_updated_at(updated_at)
+                if not t:
                     continue
+
+                if latest_time is None or t > latest_time:
+                    latest_time = t
+                    latest_msg = msg
+
+            if not latest_msg:
+                time.sleep(10)
+                continue
+
+            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, nonce = fetch_download_links(youtube_url)
+            
+            if not nonce:
+                print("nonceの取得に失敗しました")
+                time.sleep(10)
+                continue
+
+            video_item, audio_item = select_best_video_and_audio(items)
+            if not video_item or not audio_item:
+                print("適切な動画または音声が見つかりません")
+                time.sleep(10)
+                continue
+
+            # 画質情報を取得
+            quality_match = re.match(r"(\d+)p", video_item["quality"])
+            if not quality_match:
+                print("画質情報の取得に失敗しました")
+                time.sleep(10)
+                continue
                 
-                print(f"新しいYouTube動画を検出: {youtube_id}")
-                
-                try:
-                    # YouTube URL
-                    youtube_url = f"https://www.youtube.com/watch?v={youtube_id}"
-                    
-                    # ssyoutubeから情報を取得
-                    html_content = fetch_download_links(youtube_url)
-                    
-                    # 最高画質の動画と音声を選択
-                    video_item, audio_item, nonce, video_title = select_best_video_and_audio(html_content)
-                    
-                    if not video_item or not audio_item:
-                        print(f"適切な動画/音声が見つかりません: {youtube_id}")
-                        continue
-                    
-                    print(f"動画品質: {video_item['data_quality']}")
-                    print(f"動画タイトル: {video_title}")
-                    
-                    # サーバーサイド結合をリクエスト
-                    monitor_url = request_video_merge(youtube_id, video_item, audio_item, nonce, video_title)
-                    print(f"結合リクエスト送信: {monitor_url}")
-                    
-                    # 結合進捗を監視
-                    download_url = monitor_merge_progress(monitor_url)
-                    print(f"結合完了: {download_url}")
-                    
-                    # Channel.ioに送信
-                    quality = video_item['data_quality']
-                    message = f"🎬 結合済み動画 ({quality})\n{download_url}"
-                    send_to_channel(message)
-                    
-                    print(f"送信完了: {message}")
-                    
-                    # 処理済みメッセージとして記録
-                    processed_messages.add(msg_id)
-                    
-                    # 次のメッセージを処理する前に少し待機
-                    time.sleep(5)
-                    
-                except Exception as e:
-                    print(f"動画処理中にエラー ({youtube_id}): {e}")
-                    # エラーが発生しても処理済みにしない（再試行可能にする）
-                    continue
+            quality = quality_match.group(1)
+            
+            # 動画タイトル（簡易版 - 実際にはYouTubeから取得する方が良い）
+            video_title = f"youtube_video_{youtube_id}"
             
-            # 全てのメッセージをチェックしたら待機
-            time.sleep(10)
+            # サーバー側で結合
+            print(f"サーバー側での結合を開始します: {youtube_id} {quality}p")
+            merged_url = merge_video_on_server(
+                video_item["url"],
+                audio_item["url"],
+                youtube_id,
+                quality,
+                video_title,
+                nonce
+            )
+            
+            # 結果を送信
+            message = f"🎬 結合済み動画（{quality}p）\n{merged_url}"
+            send_to_channel(message)
+            
+            # 処理済みとしてマーク
+            processed_messages.add(latest_msg.get("id"))
             
+            print("送信完了:", merged_url)
+
         except Exception as e:
-            print(f"メインループでエラー: {e}")
-            time.sleep(15)
+            print("エラー:", e)
+            import traceback
+            traceback.print_exc()
+
+        time.sleep(15)
 
 if __name__ == "__main__":
     main()