Update app.py

app.py

@@ -38,9 +38,10 @@ HEADERS_POST = {
 SSYOUTUBE_URL = "https://ssyoutube.online/yt-video-detail/"
 
 # ===== tflink =====
-TFLINK_UPLOAD_URL = os.getenv("TFLINK_UPLOAD_URL")
-if not TFLINK_UPLOAD_URL:
-    raise RuntimeError("環境変数 TFLINK_UPLOAD_URL が設定されていません")
+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):
@@ -94,68 +95,45 @@ def fetch_download_links(youtube_url):
 
     return results
 
-# ===== 動画結合 =====
-def merge_video_audio(video_url, audio_url, output_file):
-    # ダウンロード
-    video_path = "video.mp4"
-    audio_path = "audio.m4a"
-    with requests.get(video_url, stream=True) as r:
-        r.raise_for_status()
-        with open(video_path, "wb") as f:
-            for chunk in r.iter_content(chunk_size=8192):
-                f.write(chunk)
-
-    with requests.get(audio_url, stream=True) as r:
-        r.raise_for_status()
-        with open(audio_path, "wb") as f:
-            for chunk in r.iter_content(chunk_size=8192):
-                f.write(chunk)
-
-    # ffmpeg で結合
+# ===== ファイル操作 =====
+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_file
+        "ffmpeg", "-y", 
+        "-i", video_path, 
+        "-i", audio_path, 
+        "-c:v", "copy", 
+        "-c:a", "aac", 
+        output_path
     ]
     subprocess.run(cmd, check=True)
 
-    # 一時ファイル削除
-    os.remove(video_path)
-    os.remove(audio_path)
-
 # ===== tflink アップロード =====
-def upload_to_tflink(file_path):
-    with open(file_path, "rb") as f:
-        res = requests.post(TFLINK_UPLOAD_URL, files={"file": f})
-    res.raise_for_status()
-    return res.json().get("url")
+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 送信 =====
-def build_links(items):
-    lines = []
-    for item in items:
-        url = item["url"]
-        quality = item["quality"]
-        has_audio = item["has_audio"]
-
-        audio_label = ""
-        if has_audio == "false":
-            audio_label = "（映像のみ）"
-        elif has_audio == "true":
-            audio_label = "（音声付き）"
-
-        line = f'<link type="url" value="{url}"> {quality} {audio_label}</link>'
-        lines.append(line)
-
-    return "\n".join(lines)
-
 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,
@@ -163,7 +141,12 @@ def send_to_channel(text):
         "customPayload": None
     }
 
-    res = requests.post(POST_URL, headers=HEADERS_POST, data=json.dumps(payload), timeout=30)
+    res = requests.post(
+        POST_URL,
+        headers=HEADERS_POST,
+        data=json.dumps(payload),
+        timeout=30
+    )
     res.raise_for_status()
 
 # ===== Main =====
@@ -204,28 +187,32 @@ def main():
 
             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_item = max((i for i in items if i['has_audio']=='false'), key=lambda x: int(x['quality'].replace('p','') if x['quality']!='audio' else 0))
-            audio_item = next((i for i in items if i['has_audio']=='true' and i['quality']=='audio'), None)
+            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_item or not audio_item:
-                print("動画または音声が不足しています")
+            if not video_items or not audio_items:
+                print("必要な動画/音声が取得できませんでした")
                 time.sleep(10)
                 continue
 
-            output_file = "merged.mp4"
-            merge_video_audio(video_item['url'], audio_item['url'], output_file)
+            # 高画質の動画を選択
+            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"
+
+            download_file(video_url, video_file)
+            download_file(audio_url, audio_file)
+
+            merge_video_audio(video_file, audio_file, output_file)
 
-            # tflink アップロード
             tflink_url = upload_to_tflink(output_file)
-            os.remove(output_file)
 
-            message_text = build_links(items) + f"\n結合ファイル: {tflink_url}"
+            message_text = f"結合済み動画はこちら: {tflink_url}"
             send_to_channel(message_text)
             print("送信完了")
 
@@ -235,4 +222,4 @@ def main():
         time.sleep(15)
 
 if __name__ == "__main__":
-    main()
+    main()