mirror of
https://github.com/pacnpal/Pac-cogs.git
synced 2025-12-20 02:41:06 -05:00
Fix URL detection and validation
- Add proper URL validation (must start with http/https or contain dot) - Remove duplicate URL check that caused double processing - Add detailed debug logging for URL detection process - Fix enabled_sites filtering logic This fixes issues with URL detection and improves validation to prevent processing non-URL text.
This commit is contained in:
pacnpal
@@ -211,11 +211,17 @@ class VideoProcessor:
|
||||
for word in message.content.split():
|
||||
# Log each word being checked
|
||||
logger.debug(f"Checking word: {word}")
|
||||
# Basic URL validation - must start with http/https or contain a dot
|
||||
if word.startswith(('http://', 'https://')) or '.' in word:
|
||||
# If no sites are enabled, accept all URLs
|
||||
# Otherwise, check if URL contains any enabled site
|
||||
if not enabled_sites or any(site in word.lower() for site in enabled_sites):
|
||||
logger.debug(f"Found matching URL: {word}")
|
||||
urls.append(word)
|
||||
else:
|
||||
logger.debug(f"URL {word} doesn't match any enabled sites")
|
||||
else:
|
||||
logger.debug(f"Word {word} is not a valid URL")
|
||||
|
||||
# Add attachment URLs
|
||||
for attachment in message.attachments:
|
||||
@@ -250,7 +256,7 @@ class VideoProcessor:
|
||||
except Exception as e:
|
||||
logger.error(f"Error processing message: {traceback.format_exc()}")
|
||||
try:
|
||||
await message.add_reaction(REACTIONS['error'])
|
||||
await message.add_reaction(REACTIONS["error"])
|
||||
except:
|
||||
pass
|
||||
|
||||
@@ -281,8 +287,10 @@ class VideoProcessor:
|
||||
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'])
|
||||
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
|
||||
@@ -303,23 +311,24 @@ class VideoProcessor:
|
||||
loop = self.bot.loop
|
||||
|
||||
if not loop.is_running():
|
||||
logger.warning("Event loop is not running, skipping progress update")
|
||||
logger.warning(
|
||||
"Event loop is not running, skipping progress update"
|
||||
)
|
||||
return
|
||||
|
||||
# Create a task to update the reaction
|
||||
asyncio.run_coroutine_threadsafe(
|
||||
self.update_download_progress_reaction(original_message, progress),
|
||||
loop
|
||||
self.update_download_progress_reaction(
|
||||
original_message, progress
|
||||
),
|
||||
loop,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Error in progress callback: {e}")
|
||||
|
||||
# Create and track download task
|
||||
download_task = asyncio.create_task(
|
||||
downloader.download_video(
|
||||
item.url,
|
||||
progress_callback=progress_callback
|
||||
)
|
||||
downloader.download_video(item.url, progress_callback=progress_callback)
|
||||
)
|
||||
|
||||
async with self._active_downloads_lock:
|
||||
@@ -329,16 +338,20 @@ class VideoProcessor:
|
||||
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}")
|
||||
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)}")
|
||||
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:
|
||||
@@ -357,9 +370,7 @@ class VideoProcessor:
|
||||
try:
|
||||
author = original_message.author if original_message else None
|
||||
message = await message_manager.format_message(
|
||||
author=author,
|
||||
channel=channel,
|
||||
url=item.url
|
||||
author=author, channel=channel, url=item.url
|
||||
)
|
||||
except Exception as e:
|
||||
return False, f"Failed to format message: {str(e)}"
|
||||
@@ -370,26 +381,31 @@ class VideoProcessor:
|
||||
return False, "Processed file not found"
|
||||
|
||||
await archive_channel.send(
|
||||
content=message,
|
||||
file=discord.File(file_path)
|
||||
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'])
|
||||
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)}")
|
||||
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)}")
|
||||
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:
|
||||
@@ -406,15 +422,17 @@ class VideoProcessor:
|
||||
async def update_queue_position_reaction(self, message, position):
|
||||
"""Update queue position reaction"""
|
||||
try:
|
||||
for reaction in REACTIONS['numbers']:
|
||||
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}")
|
||||
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}")
|
||||
|
||||
@@ -428,7 +446,7 @@ class VideoProcessor:
|
||||
loop = asyncio.get_running_loop()
|
||||
|
||||
# Remove old reactions in the event loop
|
||||
for reaction in REACTIONS['progress']:
|
||||
for reaction in REACTIONS["progress"]:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except Exception as e:
|
||||
@@ -438,11 +456,11 @@ class VideoProcessor:
|
||||
# Add new reaction based on progress
|
||||
try:
|
||||
if progress < 33:
|
||||
await message.add_reaction(REACTIONS['progress'][0])
|
||||
await message.add_reaction(REACTIONS["progress"][0])
|
||||
elif progress < 66:
|
||||
await message.add_reaction(REACTIONS['progress'][1])
|
||||
await message.add_reaction(REACTIONS["progress"][1])
|
||||
else:
|
||||
await message.add_reaction(REACTIONS['progress'][2])
|
||||
await message.add_reaction(REACTIONS["progress"][2])
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to add progress reaction: {e}")
|
||||
|
||||
@@ -456,7 +474,7 @@ class VideoProcessor:
|
||||
|
||||
try:
|
||||
# Remove old reactions in the event loop
|
||||
for reaction in REACTIONS['download']:
|
||||
for reaction in REACTIONS["download"]:
|
||||
try:
|
||||
await message.remove_reaction(reaction, self.bot.user)
|
||||
except Exception as e:
|
||||
@@ -466,17 +484,17 @@ class VideoProcessor:
|
||||
# Add new reaction based on progress
|
||||
try:
|
||||
if progress <= 20:
|
||||
await message.add_reaction(REACTIONS['download'][0])
|
||||
await message.add_reaction(REACTIONS["download"][0])
|
||||
elif progress <= 40:
|
||||
await message.add_reaction(REACTIONS['download'][1])
|
||||
await message.add_reaction(REACTIONS["download"][1])
|
||||
elif progress <= 60:
|
||||
await message.add_reaction(REACTIONS['download'][2])
|
||||
await message.add_reaction(REACTIONS["download"][2])
|
||||
elif progress <= 80:
|
||||
await message.add_reaction(REACTIONS['download'][3])
|
||||
await message.add_reaction(REACTIONS["download"][3])
|
||||
elif progress < 100:
|
||||
await message.add_reaction(REACTIONS['download'][4])
|
||||
await message.add_reaction(REACTIONS["download"][4])
|
||||
else:
|
||||
await message.add_reaction(REACTIONS['download'][5])
|
||||
await message.add_reaction(REACTIONS["download"][5])
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to add download reaction: {e}")
|
||||
|
||||
@@ -493,7 +511,7 @@ class VideoProcessor:
|
||||
embed = discord.Embed(
|
||||
title="Queue Status Details",
|
||||
color=discord.Color.blue(),
|
||||
timestamp=datetime.utcnow()
|
||||
timestamp=datetime.utcnow(),
|
||||
)
|
||||
|
||||
# Queue statistics
|
||||
@@ -507,13 +525,13 @@ class VideoProcessor:
|
||||
f"Success Rate: {queue_status['metrics']['success_rate']:.1%}\n"
|
||||
f"Avg Processing Time: {queue_status['metrics']['avg_processing_time']:.1f}s\n"
|
||||
f"```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
|
||||
# Active downloads
|
||||
active_downloads = ""
|
||||
for url, progress in _download_progress.items():
|
||||
if progress.get('active', False):
|
||||
if progress.get("active", False):
|
||||
active_downloads += (
|
||||
f"URL: {url[:50]}...\n"
|
||||
f"Progress: {progress.get('percent', 0):.1f}%\n"
|
||||
@@ -529,19 +547,19 @@ class VideoProcessor:
|
||||
embed.add_field(
|
||||
name="Active Downloads",
|
||||
value=f"```\n{active_downloads}```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
else:
|
||||
embed.add_field(
|
||||
name="Active Downloads",
|
||||
value="```\nNo active downloads```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
|
||||
# Active compressions
|
||||
active_compressions = ""
|
||||
for url, progress in _compression_progress.items():
|
||||
if progress.get('active', False):
|
||||
if progress.get("active", False):
|
||||
active_compressions += (
|
||||
f"File: {progress.get('filename', 'Unknown')}\n"
|
||||
f"Progress: {progress.get('percent', 0):.1f}%\n"
|
||||
@@ -558,25 +576,27 @@ class VideoProcessor:
|
||||
embed.add_field(
|
||||
name="Active Compressions",
|
||||
value=f"```\n{active_compressions}```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
else:
|
||||
embed.add_field(
|
||||
name="Active Compressions",
|
||||
value="```\nNo active compressions```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
|
||||
# Error statistics
|
||||
if queue_status['metrics']['errors_by_type']:
|
||||
if queue_status["metrics"]["errors_by_type"]:
|
||||
error_stats = "\n".join(
|
||||
f"{error_type}: {count}"
|
||||
for error_type, count in queue_status['metrics']['errors_by_type'].items()
|
||||
for error_type, count in queue_status["metrics"][
|
||||
"errors_by_type"
|
||||
].items()
|
||||
)
|
||||
embed.add_field(
|
||||
name="Error Statistics",
|
||||
value=f"```\n{error_stats}```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
|
||||
# Hardware acceleration statistics
|
||||
@@ -587,7 +607,7 @@ class VideoProcessor:
|
||||
f"Compression Failures: {queue_status['metrics']['compression_failures']}\n"
|
||||
f"Peak Memory Usage: {queue_status['metrics']['peak_memory_usage']:.1f}MB\n"
|
||||
f"```",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
|
||||
await ctx.send(embed=embed)
|
||||
|
||||
Reference in New Issue
Block a user