Update watcher.py

watcher.py

@@ -3,7 +3,6 @@ import re
 import time
 import json
 import requests
-import subprocess
 from datetime import datetime, timezone
 
 # ===== Channel.io 設定 =====
@@ -33,6 +32,9 @@ HEADERS_POST = {
     "x-account": X_ACCOUNT,
 }
 
+# ===== Vidfly API =====
+VIDFLY_API = "https://api.vidfly.ai/api/media/youtube/download?url="
+
 # ===== Utils =====
 def parse_updated_at(value):
     if isinstance(value, (int, float)):
@@ -57,77 +59,21 @@ def extract_youtube_id(text):
             return m.group(1)
     return None
 
-# ===== yt-dlp =====
-def fetch_formats_with_ytdlp(youtube_url):
-    """
-    yt-dlp を使って動画フォーマット一覧を取得
-    """
-    cmd = [
-        "yt-dlp",
-        "-j",
-        "--no-playlist",
-        youtube_url,
-    ]
-
-    proc = subprocess.run(
-        cmd,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-    )
-
-    if proc.returncode != 0:
-        raise RuntimeError(proc.stderr)
-
-    info = json.loads(proc.stdout)
-    formats = info.get("formats", [])
-
-    items = []
-    for f in formats:
-        url = f.get("url")
-        ext = f.get("ext")
-        height = f.get("height")
-        vcodec = f.get("vcodec")
-        acodec = f.get("acodec")
-
-        if not url or not ext or not height:
-            continue
-
-        media_type = (
-            "video_with_audio"
-            if vcodec != "none" and acodec != "none"
-            else "video"
-        )
-
-        items.append({
-            "url": url,
-            "ext": ext,
-            "height": height,
-            "type": media_type,
-        })
-
-    return items
-
 def build_links(items):
     lines = []
-
-    # 高画質順に並び替え
-    items = sorted(items, key=lambda x: x["height"], reverse=True)
-
     for item in items:
-        url = item["url"]
-        ext = item["ext"]
-        height = item["height"]
-        media_type = item["type"]
+        url = item.get("url")
+        ext = item.get("ext")
+        height = item.get("height")
+        media_type = item.get("type")
+
+        if not url or not ext or not height:
+            continue
 
         label_type = "動画" if ext in ("mp4", "webm") else "音声"
         audio_suffix = " (音声付き)" if media_type == "video_with_audio" else ""
 
-        line = (
-            f'<link type="url" value="{url}">'
-            f'{label_type}{audio_suffix} {height}p'
-            f'</link>'
-        )
+        line = f'<link type="url" value="{url}">{label_type}{audio_suffix} {height}p</link>'
         lines.append(line)
 
     return "\n".join(lines)
@@ -152,7 +98,7 @@ def send_to_channel(text):
         POST_URL,
         headers=HEADERS_POST,
         data=json.dumps(payload),
-        timeout=30,
+        timeout=30
     )
     res.raise_for_status()
 
@@ -200,17 +146,17 @@ def main():
                 continue
 
             youtube_url = f"https://www.youtube.com/watch?v={youtube_id}"
+            vidfly_res = requests.get(VIDFLY_API + youtube_url, timeout=30)
+            vidfly_res.raise_for_status()
 
-            # ===== yt-dlp で URL 取得 =====
-            items = fetch_formats_with_ytdlp(youtube_url)
+            items = vidfly_res.json().get("data", {}).get("items", [])
             if not items:
-                print("yt-dlp の formats が空です")
+                print("Vidfly の items が空です")
                 time.sleep(10)
                 continue
 
             message_text = build_links(items)
             send_to_channel(message_text)
-
             print("送信完了")
 
         except Exception as e: