mirror of
https://github.com/pacnpal/Pac-cogs.git
synced 2025-12-20 10:51:05 -05:00
Added timeout handling and force cleanup in VideoArchiver cog
Added proper cancellation and requeuing of downloads in VideoProcessor Added cancellable logger and process cleanup in VideoDownloader Added shutdown flag and force_stop capability in EnhancedQueueManager Added process tracking and kill_all_processes method in FFmpegManager The changes ensure that: Active downloads are paused and requeued when unload is called If cleanup takes too long, force cleanup kicks in All resources are properly cleaned up, even in case of timeout Downloads can be safely cancelled and resumed later No processes are left hanging during unload
This commit is contained in:
pacnpal
@@ -7,7 +7,7 @@ import discord
|
||||
from discord.ext import commands
|
||||
from discord import app_commands
|
||||
from pathlib import Path
|
||||
from typing import Dict, Any, Optional, Tuple
|
||||
from typing import Dict, Any, Optional, Tuple, Set
|
||||
import traceback
|
||||
from datetime import datetime
|
||||
|
||||
@@ -28,9 +28,9 @@ REACTIONS = {
|
||||
'processing': '⚙️',
|
||||
'success': '✅',
|
||||
'error': '❌',
|
||||
'numbers': ['1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣'], # Queue position indicators
|
||||
'progress': ['⬛', '🟨', '🟩'], # Progress indicators (0%, 50%, 100%)
|
||||
'download': ['0️⃣', '2️⃣', '4️⃣', '6️⃣', '8️⃣', '🔟'] # Download progress (0%, 20%, 40%, 60%, 80%, 100%)
|
||||
'numbers': ['1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣'],
|
||||
'progress': ['⬛', '🟨', '🟩'],
|
||||
'download': ['0️⃣', '2️⃣', '4️⃣', '6️⃣', '8️⃣', '🔟']
|
||||
}
|
||||
|
||||
# Global queue manager instance to persist across reloads
|
||||
@@ -56,18 +56,21 @@ class VideoProcessor:
|
||||
self.components = components
|
||||
self.ffmpeg_mgr = ffmpeg_mgr
|
||||
|
||||
# Track active downloads and their tasks
|
||||
self._active_downloads: Dict[str, asyncio.Task] = {}
|
||||
self._active_downloads_lock = asyncio.Lock()
|
||||
self._unloading = False
|
||||
|
||||
# Use global queue manager if available
|
||||
global _global_queue_manager
|
||||
if _global_queue_manager is not None:
|
||||
self.queue_manager = _global_queue_manager
|
||||
logger.info("Using existing global queue manager")
|
||||
# Use provided queue manager if available
|
||||
elif queue_manager:
|
||||
self.queue_manager = queue_manager
|
||||
_global_queue_manager = queue_manager
|
||||
logger.info("Using provided queue manager and setting as global")
|
||||
else:
|
||||
# Initialize enhanced queue manager with persistence and error recovery
|
||||
data_dir = Path(os.path.dirname(__file__)) / "data"
|
||||
data_dir.mkdir(parents=True, exist_ok=True)
|
||||
queue_path = data_dir / "queue_state.json"
|
||||
@@ -76,30 +79,338 @@ class VideoProcessor:
|
||||
max_retries=3,
|
||||
retry_delay=5,
|
||||
max_queue_size=1000,
|
||||
cleanup_interval=1800, # 30 minutes
|
||||
max_history_age=86400, # 24 hours
|
||||
cleanup_interval=1800,
|
||||
max_history_age=86400,
|
||||
persistence_path=str(queue_path)
|
||||
)
|
||||
_global_queue_manager = self.queue_manager
|
||||
logger.info("Created new queue manager and set as global")
|
||||
|
||||
# Track failed downloads for cleanup
|
||||
self._failed_downloads = set()
|
||||
self._failed_downloads_lock = asyncio.Lock()
|
||||
|
||||
# Start queue processing
|
||||
logger.info("Starting video processing queue...")
|
||||
self._queue_task = asyncio.create_task(self.queue_manager.process_queue(self._process_video))
|
||||
logger.info("Video processing queue started successfully")
|
||||
|
||||
# Register commands
|
||||
@commands.hybrid_command(name='queuedetails')
|
||||
@commands.is_owner()
|
||||
async def queue_details(ctx):
|
||||
"""Show detailed queue status and progress information"""
|
||||
await self._show_queue_details(ctx)
|
||||
async def _cancel_active_downloads(self) -> None:
|
||||
"""Cancel all active downloads and requeue them"""
|
||||
async with self._active_downloads_lock:
|
||||
for url, task in self._active_downloads.items():
|
||||
if not task.done():
|
||||
# Cancel the task
|
||||
task.cancel()
|
||||
try:
|
||||
await task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
except Exception as e:
|
||||
logger.error(f"Error cancelling download task for {url}: {e}")
|
||||
|
||||
self.bot.add_command(queue_details)
|
||||
# Requeue the download if we're unloading
|
||||
if self._unloading and url in _download_progress:
|
||||
try:
|
||||
# Get the original message details from progress tracking
|
||||
progress = _download_progress[url]
|
||||
if progress.get('message_id') and progress.get('channel_id') and progress.get('guild_id'):
|
||||
await self.queue_manager.add_to_queue(
|
||||
url=url,
|
||||
message_id=progress['message_id'],
|
||||
channel_id=progress['channel_id'],
|
||||
guild_id=progress['guild_id'],
|
||||
author_id=progress.get('author_id')
|
||||
)
|
||||
logger.info(f"Requeued download for {url}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to requeue download for {url}: {e}")
|
||||
|
||||
self._active_downloads.clear()
|
||||
|
||||
async def cleanup(self) -> None:
|
||||
"""Clean up resources with proper handling"""
|
||||
try:
|
||||
self._unloading = True
|
||||
|
||||
# Cancel queue processing
|
||||
if hasattr(self, '_queue_task') and not self._queue_task.done():
|
||||
self._queue_task.cancel()
|
||||
try:
|
||||
await self._queue_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
# Cancel and requeue active downloads
|
||||
await self._cancel_active_downloads()
|
||||
|
||||
# Clean up progress tracking
|
||||
_download_progress.clear()
|
||||
_compression_progress.clear()
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error during processor cleanup: {e}")
|
||||
raise
|
||||
finally:
|
||||
self._unloading = False
|
||||
|
||||
async def force_cleanup(self) -> None:
|
||||
"""Force cleanup of resources when timeout occurs"""
|
||||
try:
|
||||
# Cancel all tasks immediately without requeuing
|
||||
async with self._active_downloads_lock:
|
||||
for task in self._active_downloads.values():
|
||||
if not task.done():
|
||||
task.cancel()
|
||||
|
||||
# Cancel queue task
|
||||
if hasattr(self, '_queue_task') and not self._queue_task.done():
|
||||
self._queue_task.cancel()
|
||||
|
||||
# Clear all tracking
|
||||
self._active_downloads.clear()
|
||||
_download_progress.clear()
|
||||
_compression_progress.clear()
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error during force cleanup: {e}")
|
||||
|
||||
async def process_message(self, message: discord.Message) -> None:
|
||||
"""Process a message for video content"""
|
||||
try:
|
||||
if not message.guild or not message.guild.id in self.components:
|
||||
return
|
||||
|
||||
components = self.components[message.guild.id]
|
||||
downloader = components.get("downloader")
|
||||
if not downloader:
|
||||
logger.error(f"No downloader found for guild {message.guild.id}")
|
||||
return
|
||||
|
||||
content = message.content.strip()
|
||||
if not content or not downloader.is_supported_url(content):
|
||||
return
|
||||
|
||||
try:
|
||||
await message.add_reaction(REACTIONS['queued'])
|
||||
logger.info(f"Added queued reaction to message {message.id}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to add queued reaction: {e}")
|
||||
|
||||
# Track message details in progress tracking
|
||||
_download_progress[content] = {
|
||||
'active': False,
|
||||
'message_id': message.id,
|
||||
'channel_id': message.channel.id,
|
||||
'guild_id': message.guild.id,
|
||||
'author_id': message.author.id,
|
||||
'start_time': None,
|
||||
'percent': 0,
|
||||
'speed': 'N/A',
|
||||
'eta': 'N/A',
|
||||
'downloaded_bytes': 0,
|
||||
'total_bytes': 0,
|
||||
'retries': 0
|
||||
}
|
||||
|
||||
await self.queue_manager.add_to_queue(
|
||||
url=content,
|
||||
message_id=message.id,
|
||||
channel_id=message.channel.id,
|
||||
guild_id=message.guild.id,
|
||||
author_id=message.author.id
|
||||
)
|
||||
logger.info(f"Added message {message.id} to processing queue")
|
||||
|
||||
queue_status = self.queue_manager.get_queue_status(message.guild.id)
|
||||
queue_position = queue_status['pending'] - 1
|
||||
await self.update_queue_position_reaction(message, queue_position)
|
||||
logger.info(f"Message {message.id} is at position {queue_position + 1} in queue")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error processing message: {traceback.format_exc()}")
|
||||
raise ProcessingError(f"Failed to process message: {str(e)}")
|
||||
|
||||
async def _process_video(self, item) -> Tuple[bool, Optional[str]]:
|
||||
"""Process a video from the queue"""
|
||||
if self._unloading:
|
||||
return False, "Processor is unloading"
|
||||
|
||||
file_path = None
|
||||
original_message = None
|
||||
download_task = None
|
||||
|
||||
try:
|
||||
guild_id = item.guild_id
|
||||
if guild_id not in self.components:
|
||||
return False, f"No components found for guild {guild_id}"
|
||||
|
||||
components = self.components[guild_id]
|
||||
downloader = components.get("downloader")
|
||||
message_manager = components.get("message_manager")
|
||||
|
||||
if not downloader or not message_manager:
|
||||
return False, f"Missing required components for guild {guild_id}"
|
||||
|
||||
try:
|
||||
channel = self.bot.get_channel(item.channel_id)
|
||||
if not channel:
|
||||
return False, f"Channel {item.channel_id} not found"
|
||||
original_message = await channel.fetch_message(item.message_id)
|
||||
|
||||
await original_message.remove_reaction(REACTIONS['queued'], self.bot.user)
|
||||
await original_message.add_reaction(REACTIONS['processing'])
|
||||
logger.info(f"Started processing message {item.message_id}")
|
||||
except discord.NotFound:
|
||||
original_message = None
|
||||
except Exception as e:
|
||||
logger.error(f"Error fetching original message: {e}")
|
||||
original_message = None
|
||||
|
||||
# Create and track download task
|
||||
download_task = asyncio.create_task(
|
||||
downloader.download_video(
|
||||
item.url,
|
||||
progress_callback=lambda progress: self.update_download_progress_reaction(original_message, progress) if original_message else None
|
||||
)
|
||||
)
|
||||
|
||||
async with self._active_downloads_lock:
|
||||
self._active_downloads[item.url] = download_task
|
||||
|
||||
try:
|
||||
success, file_path, error = await download_task
|
||||
if not success:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Download failed for message {item.message_id}: {error}")
|
||||
return False, f"Failed to download video: {error}"
|
||||
except asyncio.CancelledError:
|
||||
logger.info(f"Download cancelled for {item.url}")
|
||||
return False, "Download cancelled"
|
||||
except Exception as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Download error for message {item.message_id}: {str(e)}")
|
||||
return False, f"Download error: {str(e)}"
|
||||
finally:
|
||||
async with self._active_downloads_lock:
|
||||
self._active_downloads.pop(item.url, None)
|
||||
|
||||
# Get archive channel
|
||||
guild = self.bot.get_guild(guild_id)
|
||||
if not guild:
|
||||
return False, f"Guild {guild_id} not found"
|
||||
|
||||
archive_channel = await self.config.get_channel(guild, "archive")
|
||||
if not archive_channel:
|
||||
return False, "Archive channel not configured"
|
||||
|
||||
# Format message
|
||||
try:
|
||||
author = original_message.author if original_message else None
|
||||
message = await message_manager.format_message(
|
||||
author=author,
|
||||
channel=channel,
|
||||
url=item.url
|
||||
)
|
||||
except Exception as e:
|
||||
return False, f"Failed to format message: {str(e)}"
|
||||
|
||||
# Upload to archive channel
|
||||
try:
|
||||
if not os.path.exists(file_path):
|
||||
return False, "Processed file not found"
|
||||
|
||||
await archive_channel.send(
|
||||
content=message,
|
||||
file=discord.File(file_path)
|
||||
)
|
||||
|
||||
if original_message:
|
||||
await original_message.remove_reaction(REACTIONS['processing'], self.bot.user)
|
||||
await original_message.add_reaction(REACTIONS['success'])
|
||||
logger.info(f"Successfully processed message {item.message_id}")
|
||||
|
||||
return True, None
|
||||
|
||||
except discord.HTTPException as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Failed to upload to Discord for message {item.message_id}: {str(e)}")
|
||||
return False, f"Failed to upload to Discord: {str(e)}"
|
||||
except Exception as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Failed to archive video for message {item.message_id}: {str(e)}")
|
||||
return False, f"Failed to archive video: {str(e)}"
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error processing video: {traceback.format_exc()}")
|
||||
return False, str(e)
|
||||
finally:
|
||||
# Clean up downloaded file
|
||||
if file_path and os.path.exists(file_path):
|
||||
try:
|
||||
os.unlink(file_path)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to clean up file {file_path}: {e}")
|
||||
|
||||
async def update_queue_position_reaction(self, message, position):
|
||||
"""Update queue position reaction"""
|
||||
try:
|
||||
for reaction in REACTIONS['numbers']:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except:
|
||||
pass
|
||||
|
||||
if 0 <= position < len(REACTIONS['numbers']):
|
||||
await message.add_reaction(REACTIONS['numbers'][position])
|
||||
logger.info(f"Updated queue position reaction to {position + 1} for message {message.id}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update queue position reaction: {e}")
|
||||
|
||||
async def update_progress_reaction(self, message, progress):
|
||||
"""Update progress reaction based on FFmpeg progress"""
|
||||
try:
|
||||
for reaction in REACTIONS['progress']:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except:
|
||||
pass
|
||||
|
||||
if progress < 33:
|
||||
await message.add_reaction(REACTIONS['progress'][0])
|
||||
elif progress < 66:
|
||||
await message.add_reaction(REACTIONS['progress'][1])
|
||||
else:
|
||||
await message.add_reaction(REACTIONS['progress'][2])
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update progress reaction: {e}")
|
||||
|
||||
async def update_download_progress_reaction(self, message, progress):
|
||||
"""Update download progress reaction"""
|
||||
if not message:
|
||||
return
|
||||
|
||||
try:
|
||||
for reaction in REACTIONS['download']:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except:
|
||||
pass
|
||||
|
||||
if progress <= 20:
|
||||
await message.add_reaction(REACTIONS['download'][0])
|
||||
elif progress <= 40:
|
||||
await message.add_reaction(REACTIONS['download'][1])
|
||||
elif progress <= 60:
|
||||
await message.add_reaction(REACTIONS['download'][2])
|
||||
elif progress <= 80:
|
||||
await message.add_reaction(REACTIONS['download'][3])
|
||||
elif progress < 100:
|
||||
await message.add_reaction(REACTIONS['download'][4])
|
||||
else:
|
||||
await message.add_reaction(REACTIONS['download'][5])
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update download progress reaction: {e}")
|
||||
|
||||
async def _show_queue_details(self, ctx):
|
||||
"""Display detailed queue status and progress information"""
|
||||
@@ -213,286 +524,3 @@ class VideoProcessor:
|
||||
except Exception as e:
|
||||
logger.error(f"Error showing queue details: {traceback.format_exc()}")
|
||||
await ctx.send(f"Error getting queue details: {str(e)}")
|
||||
|
||||
async def update_queue_position_reaction(self, message, position):
|
||||
"""Update queue position reaction"""
|
||||
try:
|
||||
# Remove any existing number reactions
|
||||
for reaction in REACTIONS['numbers']:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except:
|
||||
pass
|
||||
|
||||
# Add new position reaction if within range
|
||||
if 0 <= position < len(REACTIONS['numbers']):
|
||||
await message.add_reaction(REACTIONS['numbers'][position])
|
||||
logger.info(f"Updated queue position reaction to {position + 1} for message {message.id}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update queue position reaction: {e}")
|
||||
|
||||
async def update_progress_reaction(self, message, progress):
|
||||
"""Update progress reaction based on FFmpeg progress"""
|
||||
try:
|
||||
# Remove existing progress reactions
|
||||
for reaction in REACTIONS['progress']:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except:
|
||||
pass
|
||||
|
||||
# Add appropriate progress reaction
|
||||
if progress < 33:
|
||||
await message.add_reaction(REACTIONS['progress'][0])
|
||||
logger.info(f"FFmpeg progress 0-33% for message {message.id}")
|
||||
elif progress < 66:
|
||||
await message.add_reaction(REACTIONS['progress'][1])
|
||||
logger.info(f"FFmpeg progress 33-66% for message {message.id}")
|
||||
else:
|
||||
await message.add_reaction(REACTIONS['progress'][2])
|
||||
logger.info(f"FFmpeg progress 66-100% for message {message.id}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update progress reaction: {e}")
|
||||
|
||||
async def update_download_progress_reaction(self, message, progress):
|
||||
"""Update download progress reaction"""
|
||||
try:
|
||||
# Remove existing download progress reactions
|
||||
for reaction in REACTIONS['download']:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except:
|
||||
pass
|
||||
|
||||
# Add appropriate download progress reaction
|
||||
if progress <= 20:
|
||||
await message.add_reaction(REACTIONS['download'][0])
|
||||
logger.info(f"Download progress 0-20% for message {message.id}")
|
||||
elif progress <= 40:
|
||||
await message.add_reaction(REACTIONS['download'][1])
|
||||
logger.info(f"Download progress 20-40% for message {message.id}")
|
||||
elif progress <= 60:
|
||||
await message.add_reaction(REACTIONS['download'][2])
|
||||
logger.info(f"Download progress 40-60% for message {message.id}")
|
||||
elif progress <= 80:
|
||||
await message.add_reaction(REACTIONS['download'][3])
|
||||
logger.info(f"Download progress 60-80% for message {message.id}")
|
||||
elif progress < 100:
|
||||
await message.add_reaction(REACTIONS['download'][4])
|
||||
logger.info(f"Download progress 80-100% for message {message.id}")
|
||||
else:
|
||||
await message.add_reaction(REACTIONS['download'][5])
|
||||
logger.info(f"Download completed (100%) for message {message.id}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update download progress reaction: {e}")
|
||||
|
||||
async def process_message(self, message):
|
||||
"""Process a message for video content"""
|
||||
try:
|
||||
if not message.guild or not message.guild.id in self.components:
|
||||
return
|
||||
|
||||
components = self.components[message.guild.id]
|
||||
downloader = components.get("downloader")
|
||||
if not downloader:
|
||||
logger.error(f"No downloader found for guild {message.guild.id}")
|
||||
return
|
||||
|
||||
# Check if message contains a video URL
|
||||
content = message.content.strip()
|
||||
if not content or not downloader.is_supported_url(content):
|
||||
return
|
||||
|
||||
# Add initial queued reaction
|
||||
try:
|
||||
await message.add_reaction(REACTIONS['queued'])
|
||||
logger.info(f"Added queued reaction to message {message.id}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to add queued reaction: {e}")
|
||||
|
||||
# Add to processing queue
|
||||
await self.queue_manager.add_to_queue(
|
||||
url=content,
|
||||
message_id=message.id,
|
||||
channel_id=message.channel.id,
|
||||
guild_id=message.guild.id,
|
||||
author_id=message.author.id
|
||||
)
|
||||
logger.info(f"Added message {message.id} to processing queue")
|
||||
|
||||
# Update queue position
|
||||
queue_status = self.queue_manager.get_queue_status(message.guild.id)
|
||||
queue_position = queue_status['pending'] - 1 # -1 because this item was just added
|
||||
await self.update_queue_position_reaction(message, queue_position)
|
||||
logger.info(f"Message {message.id} is at position {queue_position + 1} in queue")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error processing message: {traceback.format_exc()}")
|
||||
raise ProcessingError(f"Failed to process message: {str(e)}")
|
||||
|
||||
async def _process_video(self, item) -> Tuple[bool, Optional[str]]:
|
||||
"""Process a video from the queue"""
|
||||
file_path = None
|
||||
original_message = None
|
||||
try:
|
||||
guild_id = item.guild_id
|
||||
if guild_id not in self.components:
|
||||
return False, f"No components found for guild {guild_id}"
|
||||
|
||||
components = self.components[guild_id]
|
||||
downloader = components.get("downloader")
|
||||
message_manager = components.get("message_manager")
|
||||
|
||||
if not downloader or not message_manager:
|
||||
return False, f"Missing required components for guild {guild_id}"
|
||||
|
||||
# Get original message
|
||||
try:
|
||||
channel = self.bot.get_channel(item.channel_id)
|
||||
if not channel:
|
||||
return False, f"Channel {item.channel_id} not found"
|
||||
original_message = await channel.fetch_message(item.message_id)
|
||||
|
||||
# Update reactions to show processing
|
||||
await original_message.remove_reaction(REACTIONS['queued'], self.bot.user)
|
||||
await original_message.add_reaction(REACTIONS['processing'])
|
||||
logger.info(f"Started processing message {item.message_id}")
|
||||
except discord.NotFound:
|
||||
original_message = None
|
||||
except Exception as e:
|
||||
logger.error(f"Error fetching original message: {e}")
|
||||
original_message = None
|
||||
|
||||
# Initialize progress tracking
|
||||
_download_progress[item.url] = {
|
||||
'active': True,
|
||||
'start_time': datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S'),
|
||||
'percent': 0,
|
||||
'speed': 'N/A',
|
||||
'eta': 'N/A',
|
||||
'downloaded_bytes': 0,
|
||||
'total_bytes': 0,
|
||||
'retries': 0
|
||||
}
|
||||
|
||||
# Download and process video
|
||||
try:
|
||||
success, file_path, error = await downloader.download_video(
|
||||
item.url,
|
||||
progress_callback=lambda progress: self.update_download_progress_reaction(original_message, progress) if original_message else None
|
||||
)
|
||||
if not success:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Download failed for message {item.message_id}: {error}")
|
||||
return False, f"Failed to download video: {error}"
|
||||
except Exception as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Download error for message {item.message_id}: {str(e)}")
|
||||
return False, f"Download error: {str(e)}"
|
||||
finally:
|
||||
# Clean up progress tracking
|
||||
if item.url in _download_progress:
|
||||
_download_progress[item.url]['active'] = False
|
||||
|
||||
# Get archive channel
|
||||
guild = self.bot.get_guild(guild_id)
|
||||
if not guild:
|
||||
return False, f"Guild {guild_id} not found"
|
||||
|
||||
archive_channel = await self.config.get_channel(guild, "archive")
|
||||
if not archive_channel:
|
||||
return False, "Archive channel not configured"
|
||||
|
||||
# Format message
|
||||
try:
|
||||
author = original_message.author if original_message else None
|
||||
message = await message_manager.format_message(
|
||||
author=author,
|
||||
channel=channel,
|
||||
url=item.url
|
||||
)
|
||||
except Exception as e:
|
||||
return False, f"Failed to format message: {str(e)}"
|
||||
|
||||
# Upload to archive channel
|
||||
try:
|
||||
if not os.path.exists(file_path):
|
||||
return False, "Processed file not found"
|
||||
|
||||
await archive_channel.send(
|
||||
content=message,
|
||||
file=discord.File(file_path)
|
||||
)
|
||||
|
||||
# Update reactions for success
|
||||
if original_message:
|
||||
await original_message.remove_reaction(REACTIONS['processing'], self.bot.user)
|
||||
await original_message.add_reaction(REACTIONS['success'])
|
||||
logger.info(f"Successfully processed message {item.message_id}")
|
||||
|
||||
return True, None
|
||||
|
||||
except discord.HTTPException as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Failed to upload to Discord for message {item.message_id}: {str(e)}")
|
||||
return False, f"Failed to upload to Discord: {str(e)}"
|
||||
except Exception as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Failed to archive video for message {item.message_id}: {str(e)}")
|
||||
return False, f"Failed to archive video: {str(e)}"
|
||||
|
||||
except Exception as e:
|
||||
if original_message:
|
||||
await original_message.add_reaction(REACTIONS['error'])
|
||||
logger.error(f"Error processing video: {traceback.format_exc()}")
|
||||
return False, str(e)
|
||||
|
||||
finally:
|
||||
# Clean up downloaded file
|
||||
if file_path and os.path.exists(file_path):
|
||||
try:
|
||||
os.unlink(file_path)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to clean up file {file_path}: {e}")
|
||||
|
||||
async def cleanup(self):
|
||||
"""Clean up resources"""
|
||||
try:
|
||||
# Cancel queue processing
|
||||
if hasattr(self, '_queue_task') and not self._queue_task.done():
|
||||
self._queue_task.cancel()
|
||||
try:
|
||||
await self._queue_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
# Clean up queue manager
|
||||
if hasattr(self, 'queue_manager'):
|
||||
await self.queue_manager.cleanup()
|
||||
|
||||
# Clean up failed downloads
|
||||
async with self._failed_downloads_lock:
|
||||
for file_path in self._failed_downloads:
|
||||
try:
|
||||
if os.path.exists(file_path):
|
||||
os.unlink(file_path)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to clean up file {file_path}: {e}")
|
||||
self._failed_downloads.clear()
|
||||
|
||||
# Don't clear global queue manager during cleanup
|
||||
# This ensures it persists through reloads
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error during cleanup: {traceback.format_exc()}")
|
||||
raise ProcessingError(f"Cleanup failed: {str(e)}")
|
||||
|
||||
@classmethod
|
||||
def get_queue_manager(cls) -> Optional[EnhancedVideoQueueManager]:
|
||||
"""Get the global queue manager instance"""
|
||||
global _global_queue_manager
|
||||
return _global_queue_manager
|
||||
|
||||
Reference in New Issue
Block a user