diff options
Diffstat (limited to '')
| -rw-r--r-- | cogs/downloader.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cogs/downloader.py b/cogs/downloader.py index d829ed7..900bafb 100644 --- a/cogs/downloader.py +++ b/cogs/downloader.py | |||
| @@ -12,6 +12,7 @@ import re | |||
| 12 | import yt_dlp | 12 | import yt_dlp |
| 13 | from discord.ext import commands | 13 | from discord.ext import commands |
| 14 | import aiofiles | 14 | import aiofiles |
| 15 | from cogs.utils.url_helper import clean_url_for_ytdlp | ||
| 15 | 16 | ||
| 16 | logger = logging.getLogger(__name__) | 17 | logger = logging.getLogger(__name__) |
| 17 | 18 | ||
| @@ -61,6 +62,10 @@ class Downloader(commands.Cog): | |||
| 61 | file_data = response["content"] | 62 | file_data = response["content"] |
| 62 | await ctx.respond(file=discord.File(file_data)) | 63 | await ctx.respond(file=discord.File(file_data)) |
| 63 | else: | 64 | else: |
| 65 | error_msg = response["content"] | ||
| 66 | if 'details' in response: | ||
| 67 | error_msg += f"\n{response['details']}" | ||
| 68 | await ctx.respond(f"Błąd: {error_msg}", ephemeral=True) | ||
| 64 | logger.error(f"Error: {response['content']}") | 69 | logger.error(f"Error: {response['content']}") |
| 65 | if 'details' in response: | 70 | if 'details' in response: |
| 66 | logger.error(f"Details: {response['details']}") | 71 | logger.error(f"Details: {response['details']}") |
| @@ -68,6 +73,7 @@ class Downloader(commands.Cog): | |||
| 68 | @staticmethod | 73 | @staticmethod |
| 69 | async def download_standalone(url: str, catbox: bool = False, fformat: str = "mp4", filename_user: str | None = None): | 74 | async def download_standalone(url: str, catbox: bool = False, fformat: str = "mp4", filename_user: str | None = None): |
| 70 | try: | 75 | try: |
| 76 | url = clean_url_for_ytdlp(url) | ||
| 71 | logger.info(f"Downloading {url} as {fformat}") | 77 | logger.info(f"Downloading {url} as {fformat}") |
| 72 | 78 | ||
| 73 | with tempfile.TemporaryDirectory(delete=False) as temp_dir: | 79 | with tempfile.TemporaryDirectory(delete=False) as temp_dir: |
| @@ -157,12 +163,18 @@ class Downloader(commands.Cog): | |||
| 157 | files = {'f': (filename, content, 'application/octet-stream')} | 163 | files = {'f': (filename, content, 'application/octet-stream')} |
| 158 | headers = {'Cookie': f'cppwd={os.getenv("COPYPARTY_PASSWORD")}'} | 164 | headers = {'Cookie': f'cppwd={os.getenv("COPYPARTY_PASSWORD")}'} |
| 159 | params = {'j': '1', 'ck': 'b2'} | 165 | params = {'j': '1', 'ck': 'b2'} |
| 160 | base_url = "https://catbox.2137697.xyz/sperma/" | 166 | base_url = os.getenv("COPYPARTY_URL_UPLOAD") |
| 161 | 167 | ||
| 162 | response = requests.post(base_url, files=files, headers=headers, params=params) | 168 | response = requests.post(base_url, files=files, headers=headers, params=params) |
| 163 | 169 | ||
| 164 | if response.status_code in [200, 201]: | 170 | if response.status_code in [200, 201]: |
| 165 | return Downloader._handle_upload_success(response, filename, temp_dir) | 171 | return Downloader._handle_upload_success(response, filename, temp_dir) |
| 172 | elif response.status_code == 413: | ||
| 173 | return Downloader._create_error_response( | ||
| 174 | "File too large for upload", | ||
| 175 | "Plik jest za duży, by wysłać go na serwer (limit to ok. 100MB)", | ||
| 176 | temp_dir | ||
| 177 | ) | ||
| 166 | else: | 178 | else: |
| 167 | return Downloader._create_error_response( | 179 | return Downloader._create_error_response( |
| 168 | f"Server returned {response.status_code}", | 180 | f"Server returned {response.status_code}", |
