Update watcher.py

watcher.py

@@ -8,6 +8,8 @@ import subprocess
 import requests
 from datetime import datetime, timezone
 from bs4 import BeautifulSoup
+import threading
+from concurrent.futures import ThreadPoolExecutor
 
 # ===== Channel.io 設定 =====
 GET_URL = "https://desk-api.channel.io/desk/channels/200605/groups/519217/messages"
@@ -38,6 +40,7 @@ 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):
@@ -72,13 +75,25 @@ def fetch_download_links(youtube_url):
     res.raise_for_status()
 
     soup = BeautifulSoup(res.text, "lxml")
+    
+    # 非ceトークンを抽出
+    script_text = str(soup)
+    nonce_match = re.search(r"formData\.append\('nonce', '([^']+)'\)", script_text)
+    nonce = nonce_match.group(1) if nonce_match else None
+    
+    # 動画タイトルを抽出
+    title_tag = soup.select_one("meta[property='og:title']")
+    video_title = title_tag.get("content", "動画") if title_tag else "動画"
+    
+    # ダウンロードボタンからURLを取得
     buttons = soup.select("button[data-url]")
-
     results = []
+    
     for btn in buttons:
         url = btn.get("data-url")
         quality = btn.get("data-quality")
         has_audio = btn.get("data-has-audio")
+        data_id = btn.get("data-id")  # 追加: data-id属性を取得
 
         if not url:
             continue
@@ -87,6 +102,9 @@ def fetch_download_links(youtube_url):
             "url": url,
             "quality": quality or "audio",
             "has_audio": has_audio,
+            "data_id": data_id,  # 追加
+            "nonce": nonce,
+            "video_title": video_title
         })
 
     return results
@@ -110,44 +128,138 @@ def select_best_video_and_audio(items):
     video_items.sort(key=lambda x: x[0], reverse=True)
     return video_items[0][1], audio_item
 
+# ===== サーバーサイド結合リクエスト =====
+def request_server_merge(video_item, audio_item, youtube_id):
+    """ssyoutubeのサーバーサイド結合をリクエスト"""
     
-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",
-    "Accept": "*/*",
-    "Accept-Language": "ja,en-US;q=0.9,en;q=0.8",
-    "Referer": "https://www.youtube.com/",
-    "Origin": "https://www.youtube.com",
-    "Range": "bytes=0-",
-}
-
+    # data-idからIDを抽出（例: "3aY1Z15vTw0_1080p"）
+    video_id_with_quality = video_item["data_id"]
+    
+    # リクエストデータの構築
+    request_data = {
+        "id": video_id_with_quality,
+        "ttl": 3600000,
+        "inputs": [
+            {
+                "url": video_item["url"],
+                "ext": "mp4",
+                "chunkDownload": {
+                    "type": "header",
+                    "size": 52428800,
+                    "concurrency": 3
+                }
+            },
+            {
+                "url": audio_item["url"],
+                "ext": "m4a"
+            }
+        ],
+        "output": {
+            "ext": "mp4",
+            "downloadName": f"{video_item['video_title'].replace(' ', '_')}_{video_item['quality']}.mp4",
+            "chunkUpload": {
+                "size": 104857600,
+                "concurrency": 3
+            }
+        },
+        "operation": {
+            "type": "replace_audio_in_video"
+        }
+    }
+    
+    # フォームデータを作成
+    form_data = {
+        "action": "process_video_merge",
+        "nonce": video_item["nonce"],
+        "request_data": json.dumps(request_data)
+    }
+    
+    # リクエスト送信
+    headers = {
+        "User-Agent": "Mozilla/5.0",
+        "Referer": "https://ssyoutube.online/",
+        "Origin": "https://ssyoutube.online",
+        "Content-Type": "application/x-www-form-urlencoded"
+    }
+    
+    response = requests.post(
+        SSYOUTUBE_AJAX_URL,
+        data=form_data,
+        headers=headers,
+        timeout=30
+    )
+    response.raise_for_status()
+    
+    return response.json()
 
-def download_file(url, path):
-    with requests.get(
-        url,
-        headers=HEADERS,
-        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):
-                if chunk:
-                    f.write(chunk)
+# ===== 結合ステータスの監視 =====
+def monitor_merge_status(http_status_url, max_attempts=60, interval=5):
+    """結合処理のステータスを監視"""
+    
+    headers = {
+        "User-Agent": "Mozilla/5.0",
+        "Accept": "application/json"
+    }
+    
+    for attempt in range(max_attempts):
+        try:
+            response = requests.get(http_status_url, headers=headers, timeout=30)
+            response.raise_for_status()
+            status_data = response.json()
+            
+            if status_data.get("success") and status_data.get("result", {}).get("status") == "done":
+                output = status_data["result"].get("output", {})
+                if output.get("url"):
+                    return output["url"]
+            
+            # 進行中の場合は待機
+            progress = status_data.get("result", {}).get("progress_in_percent", 0)
+            print(f"結合進行中: {progress}%")
+            
+        except Exception as e:
+            print(f"ステータス取得エラー: {e}")
+        
+        time.sleep(interval)
+    
+    return None
 
-# ===== 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)
+# ===== ダウンロードと結合の新しいメイン関数 =====
+def download_and_merge_with_server(youtube_id, video_item, audio_item):
+    """サーバーサイド結合を使用"""
+    
+    try:
+        print(f"サーバーサイド結合を開始: {youtube_id} {video_item['quality']}")
+        
+        # 1. サーバー結合をリクエスト
+        merge_response = request_server_merge(video_item, audio_item, youtube_id)
+        
+        if not merge_response.get("success"):
+            print("サーバー結合リクエスト失敗")
+            return None
+        
+        # 2. 監視URLを取得
+        monitor_info = merge_response.get("data", {}).get("result", {}).get("monitor", {})
+        http_status_url = monitor_info.get("http")
+        
+        if not http_status_url:
+            print("監視URLが見つかりません")
+            return None
+        
+        print(f"監視URL: {http_status_url}")
+        
+        # 3. 結合完了を監視
+        merged_video_url = monitor_merge_status(http_status_url)
+        
+        if not merged_video_url:
+            print("結合がタイムアウトしました")
+            return None
+        
+        print(f"結合完了: {merged_video_url}")
+        return merged_video_url
+        
+    except Exception as e:
+        print(f"サーバー結合中にエラー: {e}")
+        return None
 
 # ===== file.io アップロード =====
 def upload_to_fileio(file_path):
@@ -175,8 +287,70 @@ def send_to_channel(text):
     )
     res.raise_for_status()
 
+# ===== 古いダウンロード関数（フォールバック用） =====
+def download_file_old(url, path):
+    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",
+        "Accept": "*/*",
+        "Accept-Language": "ja,en-US;q=0.9,en;q=0.8",
+        "Referer": "https://www.youtube.com/",
+        "Origin": "https://www.youtube.com",
+        "Range": "bytes=0-",
+    }
+    
+    with requests.get(
+        url,
+        headers=headers,
+        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):
+                if chunk:
+                    f.write(chunk)
+
+def merge_video_audio_old(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)
+
+# ===== フォールバック処理 =====
+def fallback_local_merge(video_item, audio_item, youtube_id):
+    """サーバー結合が失敗した場合のローカル結合フォールバック"""
+    try:
+        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_old(video_item["url"], video_path)
+            download_file_old(audio_item["url"], audio_path)
+            
+            merge_video_audio_old(video_path, audio_path, output_path)
+            
+            link = upload_to_fileio(output_path)
+            return link
+            
+    except Exception as e:
+        print(f"ローカル結合も失敗: {e}")
+        return None
+
 # ===== Main =====
 def main():
+    processed_messages = set()  # 処理済みメッセージを記録
+    
     while True:
         try:
             res = requests.get(
@@ -188,58 +362,70 @@ def main():
             res.raise_for_status()
 
             messages = res.json().get("messages", [])
-            latest_msg = None
-            latest_time = None
-
+            
+            # 最新のYouTubeリンクを含むメッセージを探す
             for msg in messages:
+                msg_id = msg.get("id")
                 plain_text = msg.get("plainText")
-                updated_at = msg.get("updatedAt")
-
-                if not plain_text or updated_at is None:
+                
+                if not plain_text or not msg_id:
                     continue
-
-                t = parse_updated_at(updated_at)
-                if not t:
+                
+                # 既に処理済みならスキップ
+                if msg_id in processed_messages:
                     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 = fetch_download_links(youtube_url)
-
-            video_item, audio_item = select_best_video_and_audio(items)
-            if not video_item:
-                time.sleep(10)
-                continue
-
-            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)
+                
+                youtube_id = extract_youtube_id(plain_text)
+                if not youtube_id:
+                    continue
+                
+                print(f"新しいYouTube動画を検出: {youtube_id}")
+                
+                # ダウンロードリンクを取得
+                youtube_url = f"https://www.youtube.com/watch?v={youtube_id}"
+                items = fetch_download_links(youtube_url)
+                
+                if not items:
+                    print("ダウンロードリンクが見つかりません")
+                    continue
+                
+                # 最高画質の動画と音声を選択
+                video_item, audio_item = select_best_video_and_audio(items)
+                if not video_item or not audio_item:
+                    print("適切な動画/音声が見つかりません")
+                    continue
+                
+                print(f"選択: 動画={video_item['quality']}, 音声={audio_item['quality']}")
+                
+                # サーバーサイド結合を試みる
+                merged_url = download_and_merge_with_server(youtube_id, video_item, audio_item)
+                
+                if merged_url:
+                    # 成功した場合、直接URLを送信
+                    send_to_channel(f"🎬 結合済み動画（{video_item['quality']}）\n{merged_url}")
+                    print(f"送信完了: {merged_url}")
+                else:
+                    # 失敗した場合はフォールバック
+                    print("サーバー結合失敗、フォールバックを試みます...")
+                    fallback_url = fallback_local_merge(video_item, audio_item, youtube_id)
+                    if fallback_url:
+                        send_to_channel(f"🎬 結合済み動画（{video_item['quality']}）\n{fallback_url}")
+                        print(f"フォールバック送信完了: {fallback_url}")
+                    else:
+                        print("全ての結合方法が失敗しました")
+                
+                # 処理済みとして記録
+                processed_messages.add(msg_id)
+                break  # 一度に1つだけ処理
+            
+            else:
+                # 新しいメッセージがない場合
+                pass
 
         except Exception as e:
             print("エラー:", e)
+            import traceback
+            traceback.print_exc()
 
         time.sleep(15)