Merge branch 'dev'

Signed-off-by: salmonik <raisersoft@proton.me>

1 files changed, 30 insertions, 5 deletions

diff --git a/cogs/downloader.py b/cogs/downloader.py
index 36bd723..900bafb 100644
--- a/cogs/downloader.py
+++ b/cogs/downloader.py
@@ -12,6 +12,7 @@ import re
 import yt_dlp
 from discord.ext import commands
 import aiofiles
+from cogs.utils.url_helper import clean_url_for_ytdlp
 
 logger = logging.getLogger(__name__)
 
@@ -61,6 +62,10 @@ class Downloader(commands.Cog):
                     file_data = response["content"]
                     await ctx.respond(file=discord.File(file_data))
             else:
+                error_msg = response["content"]
+                if 'details' in response:
+                    error_msg += f"\n{response['details']}"
+                await ctx.respond(f"Błąd: {error_msg}", ephemeral=True)
                 logger.error(f"Error: {response['content']}")
                 if 'details' in response:
                     logger.error(f"Details: {response['details']}")
@@ -68,10 +73,11 @@ class Downloader(commands.Cog):
     @staticmethod
     async def download_standalone(url: str, catbox: bool = False, fformat: str = "mp4", filename_user: str | None = None):
         try:
+            url = clean_url_for_ytdlp(url)
             logger.info(f"Downloading {url} as {fformat}")
 
             with tempfile.TemporaryDirectory(delete=False) as temp_dir:
-                ydl_opts = Downloader._get_ydl_options(fformat, temp_dir)
+                ydl_opts = Downloader._get_ydl_options(filename_user, fformat, temp_dir)
 
                 with yt_dlp.YoutubeDL(ydl_opts) as ydl:
                     ydl.download([url])
@@ -87,15 +93,23 @@ class Downloader(commands.Cog):
             return Downloader._create_error_response("Download failed", str(e), None)
 
     @staticmethod
-    def _get_ydl_options(fformat: str, temp_dir: str) -> dict:
+    def _sanitize_filename(name: str) -> str:
+        invalid = '<>:"/\\|?*'
+        for c in invalid:
+            name = name.replace(c, '')
+        return name.strip()
+
+    @staticmethod
+    def _get_ydl_options(filename: str = None, fformat: str = None, temp_dir: str = None) -> dict:
+        if filename:
+            filename = Downloader._sanitize_filename(filename)[:100]
         ydl_opts = {
-            'outtmpl': os.path.join(temp_dir, '%(title)s.%(ext)s'),
+            'outtmpl': os.path.join(temp_dir, filename if filename is not None else '%(title).100s.%(ext)s'),
             'format': 'bestaudio/best' if fformat in ['mp3', 'wav', 'm4a'] else 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best',
             'merge_output_format': 'mp4',
             'postprocessors': [],
             'remote-components': 'ejs:github',
             'js-runtimes': {'deno': {'path': '/usr/bin/deno'}},
-            'o': '"%(title)s.%(ext)s"'
         }
 
         if fformat in ['mp3', 'wav', 'm4a']:
@@ -120,10 +134,15 @@ class Downloader(commands.Cog):
 
         actual_file = os.path.join(temp_dir, files[0])
         extension = actual_file.split('.')[-1]
+        extension = Downloader._sanitize_filename(extension)
 
         if not filename_user:
             filename = os.path.basename(actual_file)
+            filename = Downloader._sanitize_filename(filename)
+            if len(filename) > 100:
+                filename = filename[:100]
         else:
+            filename_user = Downloader._sanitize_filename(filename_user)[:100]
             filename = filename_user + '.' + extension
             actual_file = os.path.join(temp_dir, filename)
 
@@ -144,12 +163,18 @@ class Downloader(commands.Cog):
                 files = {'f': (filename, content, 'application/octet-stream')}
                 headers = {'Cookie': f'cppwd={os.getenv("COPYPARTY_PASSWORD")}'}
                 params = {'j': '1', 'ck': 'b2'}
-                base_url = "https://catbox.2137697.xyz/sperma/"
+                base_url = os.getenv("COPYPARTY_URL_UPLOAD")
 
                 response = requests.post(base_url, files=files, headers=headers, params=params)
 
                 if response.status_code in [200, 201]:
                     return Downloader._handle_upload_success(response, filename, temp_dir)
+                elif response.status_code == 413:
+                    return Downloader._create_error_response(
+                        "File too large for upload",
+                        "Plik jest za duży, by wysłać go na serwer (limit to ok. 100MB)",
+                        temp_dir
+                    )
                 else:
                     return Downloader._create_error_response(
                         f"Server returned {response.status_code}",