Update app.py

app.py

@@ -3,9 +3,10 @@ import re
 import time
 import json
 import requests
-import subprocess
 from datetime import datetime, timezone
 from bs4 import BeautifulSoup
+import ffmpeg
+from tflink import TFLinkClient
 
 # ===== Channel.io 設定 =====
 GET_URL = "https://desk-api.channel.io/desk/channels/200605/groups/519217/messages"
@@ -37,12 +38,6 @@ HEADERS_POST = {
 # ===== ssyoutube =====
 SSYOUTUBE_URL = "https://ssyoutube.online/yt-video-detail/"
 
-# ===== tflink =====
-TFLINK_UPLOAD_URL = "https://tflink.example/upload"  # ここを実際のURLに置き換え
-TFLINK_API_KEY = os.getenv("TFLINK_API_KEY")
-if not TFLINK_API_KEY:
-    raise RuntimeError("環境変数 TFLINK_API_KEY が設定されていません")
-
 # ===== Utils =====
 def parse_updated_at(value):
     if isinstance(value, (int, float)):
@@ -81,8 +76,8 @@ def fetch_download_links(youtube_url):
     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
@@ -95,44 +90,36 @@ def fetch_download_links(youtube_url):
 
     return results
 
-# ===== ファイル操作 =====
 def download_file(url, filename):
-    res = requests.get(url, stream=True)
-    res.raise_for_status()
-    with open(filename, "wb") as f:
-        for chunk in res.iter_content(chunk_size=8192):
-            f.write(chunk)
-
-# ===== 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)
-
-# ===== tflink アップロード =====
-def upload_to_tflink(filepath):
-    with open(filepath, "rb") as f:
-        res = requests.post(
-            TFLINK_UPLOAD_URL,
-            headers={"Authorization": f"Bearer {TFLINK_API_KEY}"},
-            files={"file": f},
-        )
-        res.raise_for_status()
-        data = res.json()
-        return data.get("url")
-
-# ===== Channel.io 送信 =====
+    with requests.get(url, stream=True) as r:
+        r.raise_for_status()
+        with open(filename, 'wb') as f:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+    return filename
+
+def merge_video_audio(video_file, audio_file, output_file):
+    (
+        ffmpeg
+        .input(video_file)
+        .output(audio_file, output_file, vcodec='copy', acodec='aac', strict='experimental')
+        .run(overwrite_output=True)
+    )
+    return output_file
+
+def upload_to_tflink(file_path):
+    client = TFLinkClient()
+    result = client.upload(file_path)
+    return result.download_link
+
 def send_to_channel(text):
     payload = {
         "requestId": f"desk-web-{int(time.time() * 1000)}",
         "blocks": [
-            {"type": "text", "value": text}
+            {
+                "type": "text",
+                "value": text
+            }
         ],
         "buttons": None,
         "form": None,
@@ -149,11 +136,15 @@ def send_to_channel(text):
     )
     res.raise_for_status()
 
-# ===== 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", [])
@@ -186,35 +177,39 @@ def main():
                 continue
 
             youtube_url = f"https://www.youtube.com/watch?v={youtube_id}"
+
             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_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"]
 
             if not video_items or not audio_items:
-                print("必要な動画/音声が取得できませんでした")
+                print("動画または音声が見つかりません")
                 time.sleep(10)
                 continue
 
-            # 高画質の動画を選択
-            video_items.sort(key=lambda x: int(re.sub(r'[^0-9]', '', x['quality'])), reverse=True)
-            video_url = video_items[0]['url']
-            audio_url = audio_items[0]['url']
-
-            video_file = "video.mp4"
-            audio_file = "audio.m4a"
-            output_file = "output.mp4"
+            # 解像度順にソートして最初を取得
+            video_items.sort(key=lambda x: int(re.sub(r"\D", "", x["quality"] or "0")), reverse=True)
+            video_url = video_items[0]["url"]
+            audio_url = audio_items[0]["url"]
 
-            download_file(video_url, video_file)
-            download_file(audio_url, audio_file)
+            video_file = download_file(video_url, "video.mp4")
+            audio_file = download_file(audio_url, "audio.m4a")
+            output_file = "merged.mp4"
 
             merge_video_audio(video_file, audio_file, output_file)
 
+            # tflink にアップロード
             tflink_url = upload_to_tflink(output_file)
 
-            message_text = f"結合済み動画はこちら: {tflink_url}"
+            message_text = f"結合動画のダウンロード: {tflink_url}"
             send_to_channel(message_text)
-            print("送信完了")
+            print("送信完了:", tflink_url)
 
         except Exception as e:
             print("エラー:", e)