Update watcher.py

watcher.py

@@ -5,8 +5,6 @@ import json
 import requests
 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"
@@ -90,27 +88,23 @@ def fetch_download_links(youtube_url):
 
     return results
 
-def download_file(url, filename):
-    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 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)
 
-def upload_to_tflink(file_path):
-    client = TFLinkClient()
-    result = client.upload(file_path)
-    return result.download_link
+    return "\n".join(lines)
 
 def send_to_channel(text):
     payload = {
@@ -136,6 +130,7 @@ def send_to_channel(text):
     )
     res.raise_for_status()
 
+# ===== Main =====
 def main():
     while True:
         try:
@@ -184,32 +179,9 @@ def main():
                 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"]
-
-            if not video_items or not audio_items:
-                print("動画または音声が見つかりません")
-                time.sleep(10)
-                continue
-
-            # 解像度順にソートして最初を取得
-            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"]
-
-            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 = build_links(items)
             send_to_channel(message_text)
-            print("送信完了:", tflink_url)
+            print("送信完了")
 
         except Exception as e:
             print("エラー:", e)