From 762d9947a4db67adc2ad84a6ffef279291f2590a Mon Sep 17 00:00:00 2001 From: Lovi <62809003+Lovi-0@users.noreply.github.com> Date: Sat, 1 Mar 2025 10:23:31 +0100 Subject: [PATCH] mp4: Fix output already exists --- .../Lib/Downloader/MP4/downloader.py | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/StreamingCommunity/Lib/Downloader/MP4/downloader.py b/StreamingCommunity/Lib/Downloader/MP4/downloader.py index 619d05d..d57d6fb 100644 --- a/StreamingCommunity/Lib/Downloader/MP4/downloader.py +++ b/StreamingCommunity/Lib/Downloader/MP4/downloader.py @@ -84,7 +84,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No console.log("[red]Output file already exists.") if TELEGRAM_BOT: bot.send_message(f"Contenuto giĆ  scaricato!", None) - return 400 + return None, False if GET_ONLY_LINK: return {'path': path, 'url': url} @@ -92,23 +92,19 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No if not (url.lower().startswith('http://') or url.lower().startswith('https://')): logging.error(f"Invalid URL: {url}") console.print(f"[bold red]Invalid URL: {url}[/bold red]") - return None + return None, False - try: - headers = {} - if referer: - headers['Referer'] = referer - - if headers_: - headers.update(headers_) - else: - headers['User-Agent'] = get_userAgent() - - except Exception as header_err: - logging.error(f"Error preparing headers: {header_err}") - console.print(f"[bold red]Error preparing headers: {header_err}[/bold red]") - return None + # Set headers + headers = {} + if referer: + headers['Referer'] = referer + if headers_: + headers.update(headers_) + else: + headers['User-Agent'] = get_userAgent() + + # Set interrupt handler temp_path = f"{path}.temp" interrupt_handler = InterruptHandler() original_handler = signal.signal(signal.SIGINT, partial(signal_handler, interrupt_handler=interrupt_handler, original_handler=signal.getsignal(signal.SIGINT))) @@ -123,7 +119,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No if total == 0: console.print("[bold red]No video stream found.[/bold red]") - return None + return None, False progress_bar = tqdm( total=total,