From 7552ac50c907ad43e246739b86280f69c2006641 Mon Sep 17 00:00:00 2001
From: Wizzard <rich@bandaholics.cash>
Date: Mon, 5 Feb 2024 00:36:11 -0500
Subject: [PATCH] upgrade

---
 main.py | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/main.py b/main.py
index 6d3a797..9b6ed2c 100644
--- a/main.py
+++ b/main.py
@@ -4,10 +4,7 @@ import feedparser
 import yt_dlp as youtube_dl
 from config import DISCORD_BOT_TOKEN, DISCORD_CHANNEL_ID, YOUTUBE_CHANNEL_IDS
 import os
-
-import logging
-
-logging.basicConfig(level=logging.INFO)
+import asyncio
 
 intents = discord.Intents.default()
 intents.messages = True
@@ -18,11 +15,6 @@ bot = commands.Bot(command_prefix='!', intents=intents)
 download_dir = 'downloads'
 os.makedirs(download_dir, exist_ok=True)
 
-ydl_opts = {
-    'format': 'best',
-    'outtmpl': f'{download_dir}/%(title)s [%(id)s].%(ext)s',
-}
-
 downloaded_videos_file = 'downloaded_videos.txt'
 
 def get_downloaded_videos():
@@ -43,17 +35,31 @@ def get_latest_video_url(channel_id):
 
 @tasks.loop(minutes=10)
 async def check_new_videos():
-    logging.info("Checking new videos...")
     downloaded_videos = get_downloaded_videos()
     for channel_id in YOUTUBE_CHANNEL_IDS:
-        logging.info(f"Checking channel: {channel_id}")
-        video_url, video_id = get_latest_video_url(channel_id)
-        if video_url and video_id not in downloaded_videos:
-            with youtube_dl.YoutubeDL(ydl_opts) as ydl:
-                ydl.download([video_url])
-            add_downloaded_video(video_id)
-            channel = bot.get_channel(int(DISCORD_CHANNEL_ID))
-            await channel.send(f"@everyone New tard video dropped and has been archived: {video_url}")
+        print(f"Checking new videos for channel: {channel_id}")
+        try:
+            video_url, video_id = get_latest_video_url(channel_id)
+            if video_url and video_id not in downloaded_videos:
+                channel_download_dir = os.path.join(download_dir, channel_id)
+                os.makedirs(channel_download_dir, exist_ok=True)
+                
+                ydl_opts = {
+                    'format': 'best',
+                    'outtmpl': f'{channel_download_dir}/%(title)s [%(id)s].%(ext)s',
+                }
+                
+                with youtube_dl.YoutubeDL(ydl_opts) as ydl:
+                    ydl.download([video_url])
+                add_downloaded_video(video_id)
+                channel = bot.get_channel(int(DISCORD_CHANNEL_ID))
+                await channel.send(f"@everyone New tard video dropped and has been archived: {video_url}")
+                print(f"Downloaded and notified for channel: {channel_id}")
+            else:
+                print(f"No new videos or already downloaded for channel: {channel_id}")
+        except Exception as e:
+            print(f"Error processing channel {channel_id}: {e}")
+        await asyncio.sleep(5)
 
 @bot.event
 async def on_ready():
@@ -61,3 +67,4 @@ async def on_ready():
     check_new_videos.start()
 
 bot.run(DISCORD_BOT_TOKEN)
+