From cc9746b580d3f2aad1c58a1a2b187b557c1306fe Mon Sep 17 00:00:00 2001 From: Ghost <62809003+Ghost6446@users.noreply.github.com> Date: Mon, 27 May 2024 15:37:38 +0200 Subject: [PATCH 1/4] Fix docker progress bar ffmpeg --- README.md | 1 + Src/Api/Altadefinizione/site.py | 4 +- Src/Api/Animeunity/anime.py | 2 +- Src/Api/Animeunity/site.py | 3 +- Src/Api/Streamingcommunity/site.py | 3 +- Src/Lib/FFmpeg/capture.py | 135 ++++++++++++++++++----------- Src/Lib/FFmpeg/command.py | 5 ++ Src/Lib/Hls/downloader.py | 10 +-- config.json | 4 +- run.py | 1 + 10 files changed, 103 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index c181d5b..cb6b57d 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Make sure you have the following prerequisites installed on your system: * [python](https://www.python.org/downloads/) > 3.8 * [ffmpeg](https://www.gyan.dev/ffmpeg/builds/) +* [opnessl](https://www.openssl.org) or [pycryptodome](https://pypi.org/project/pycryptodome/) ## Installation diff --git a/Src/Api/Altadefinizione/site.py b/Src/Api/Altadefinizione/site.py index eba4160..02e6ec0 100644 --- a/Src/Api/Altadefinizione/site.py +++ b/Src/Api/Altadefinizione/site.py @@ -7,12 +7,12 @@ import logging # External libraries from bs4 import BeautifulSoup +from unidecode import unidecode # Internal utilities from Src.Util.table import TVShowManager from Src.Lib.Request import requests -from Src.Util.headers import get_headers from Src.Util.console import console from Src.Util._jsonConfig import config_manager @@ -44,7 +44,7 @@ def title_search(title_search: str) -> int: """ # Send request to search for titles - response = requests.get(f"https://{AD_SITE_NAME}.{AD_DOMAIN_NOW}/page/1/?story={title_search.replace(' ', '+')}&do=search&subaction=search&titleonly=3") + response = requests.get(f"https://{AD_SITE_NAME}.{AD_DOMAIN_NOW}/page/1/?story={unidecode(title_search.replace(' ', '+'))}&do=search&subaction=search&titleonly=3") # Create soup and find table soup = BeautifulSoup(response.text, "html.parser") diff --git a/Src/Api/Animeunity/anime.py b/Src/Api/Animeunity/anime.py index 75dcb73..ddb6417 100644 --- a/Src/Api/Animeunity/anime.py +++ b/Src/Api/Animeunity/anime.py @@ -37,7 +37,7 @@ def download_episode(index_select: int): # Get information about the selected episode obj_episode = video_source.get_info_episode(index_select) - start_message(True) + start_message() console.print(f"[yellow]Download: [red]EP_{obj_episode.number} \n") # Get the embed URL for the episode diff --git a/Src/Api/Animeunity/site.py b/Src/Api/Animeunity/site.py index cefbae1..4a90366 100644 --- a/Src/Api/Animeunity/site.py +++ b/Src/Api/Animeunity/site.py @@ -6,6 +6,7 @@ import logging # External libraries from bs4 import BeautifulSoup +from unidecode import unidecode # Internal utilities @@ -160,7 +161,7 @@ def title_search(title: str) -> int: # Prepare JSON data to be sent in the request json_data = { - 'title': title # Use the provided title for the search + 'title': unidecode(title) # Use the provided title for the search } # Send a POST request to the API endpoint for live search diff --git a/Src/Api/Streamingcommunity/site.py b/Src/Api/Streamingcommunity/site.py index b813811..95cf7e3 100644 --- a/Src/Api/Streamingcommunity/site.py +++ b/Src/Api/Streamingcommunity/site.py @@ -9,6 +9,7 @@ from typing import Tuple # External libraries from bs4 import BeautifulSoup +from unidecode import unidecode # Internal utilities @@ -136,7 +137,7 @@ def title_search(title_search: str, domain: str) -> int: """ # Send request to search for titles ( replace à to a and space to "+" ) - response = requests.get(f"https://{SC_SITE_NAME}.{domain}/api/search?q={title_search.replace(' ', '+')}", headers={'user-agent': get_headers()}) + response = requests.get(f"https://{SC_SITE_NAME}.{domain}/api/search?q={unidecode(title_search.replace(' ', '+'))}", headers={'user-agent': get_headers()}) # Add found titles to media search manager for dict_title in response.json()['data']: diff --git a/Src/Lib/FFmpeg/capture.py b/Src/Lib/FFmpeg/capture.py index a591fc6..b347b94 100644 --- a/Src/Lib/FFmpeg/capture.py +++ b/Src/Lib/FFmpeg/capture.py @@ -32,45 +32,59 @@ def capture_output(process: subprocess.Popen, description: str) -> None: # Variable to store the length of the longest progress string max_length = 0 - for line in iter(process.stdout.readline, b''): - logging.info(f"FFMPEG: {line}") + for line in iter(process.stdout.readline, ''): + try: + line = line.strip() + if not line: + continue - # Check if termination is requested - if terminate_flag.is_set(): - break + logging.info(f"FFMPEG line: {line}") - if line is not None and "size=" in str(line).strip(): + # Check if termination is requested + if terminate_flag.is_set(): + break - # Parse the output line to extract relevant information - data = parse_output_line(str(line).strip()) + if "size=" in line: + try: - if 'q' in data: - is_end = (float(data.get('q')) == -1.0) + # Parse the output line to extract relevant information + data = parse_output_line(line) - if not is_end: - byte_size = int(re.findall(r'\d+', data.get('size'))[0]) * 1000 - else: - byte_size = int(re.findall(r'\d+', data.get('Lsize'))[0]) * 1000 - else: - byte_size = int(re.findall(r'\d+', data.get('size'))[0]) * 1000 + if 'q' in data: + is_end = (float(data.get('q', -1.0)) == -1.0) + size_key = 'Lsize' if is_end else 'size' + byte_size = int(re.findall(r'\d+', data.get(size_key, '0'))[0]) * 1000 + else: + byte_size = int(re.findall(r'\d+', data.get('size', '0'))[0]) * 1000 - time_now = datetime.now().strftime('%H:%M:%S') + time_now = datetime.now().strftime('%H:%M:%S') - # Construct the progress string with formatted output information - progress_string = f"[blue][{time_now}][purple] FFmpeg [white][{description}[white]]: [white]([green]'speed': [yellow]{data.get('speed')}[white], [green]'size': [yellow]{format_size(byte_size)}[white])" - max_length = max(max_length, len(progress_string)) + # Construct the progress string with formatted output information + progress_string = (f"[blue][{time_now}][purple] FFmpeg [white][{description}]: " + f"[white]([green]'speed': [yellow]{data.get('speed', 'N/A')}[white], " + f"[green]'size': [yellow]{format_size(byte_size)}[white])") + max_length = max(max_length, len(progress_string)) - # Print the progress string to the console, overwriting the previous line - console.print(progress_string.ljust(max_length), end="\r") + # Print the progress string to the console, overwriting the previous line + console.print(progress_string.ljust(max_length), end="\r") + + except Exception as e: + logging.error(f"Error parsing output line: {line} - {e}") + + except Exception as e: + logging.error(f"Error processing line from subprocess: {e}") except Exception as e: logging.error(f"Error in capture_output: {e}") finally: - terminate_process(process) + try: + terminate_process(process) + except Exception as e: + logging.error(f"Error terminating process: {e}") -def parse_output_line(line: str) -> Tuple[str, str]: +def parse_output_line(line: str) -> dict: """ Function to parse the output line and extract relevant information. @@ -79,22 +93,27 @@ def parse_output_line(line: str) -> Tuple[str, str]: Returns: dict: A dictionary containing parsed information. - Ex. {'speed': '60.0x'} """ - data = {} + try: - # Split the line by whitespace and extract key-value pairs - parts = line.replace(" ", "").replace("= ", "=").split() + data = {} - for part in parts: - key_value = part.split('=') + # Split the line by whitespace and extract key-value pairs + parts = line.replace(" ", "").replace("= ", "=").split() - if len(key_value) == 2: - key = key_value[0] - value = key_value[1] - data[key] = value + for part in parts: + key_value = part.split('=') - return data + if len(key_value) == 2: + key = key_value[0] + value = key_value[1] + data[key] = value + + return data + + except Exception as e: + logging.error(f"Error parsing line: {line} - {e}") + return {} def terminate_process(process): @@ -104,8 +123,11 @@ def terminate_process(process): Args: - process (subprocess.Popen): The subprocess to terminate. """ - if process.poll() is None: # Check if the process is still running - process.kill() + try: + if process.poll() is None: # Check if the process is still running + process.kill() + except Exception as e: + logging.error(f"Failed to terminate process: {e}") def capture_ffmpeg_real_time(ffmpeg_command: list, description: str) -> None: @@ -122,21 +144,28 @@ def capture_ffmpeg_real_time(ffmpeg_command: list, description: str) -> None: # Clear the terminate_flag before starting a new capture terminate_flag.clear() - # Start the ffmpeg process with subprocess.Popen - process = subprocess.Popen(ffmpeg_command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) - - # Start a thread to capture and print output - output_thread = threading.Thread(target=capture_output, args=(process,description)) - output_thread.start() - try: - # Wait for ffmpeg process to complete - process.wait() - except KeyboardInterrupt: - print("Terminating ffmpeg process...") - except Exception as e: - logging.error(f"Error in ffmpeg process: {e}") - finally: - terminate_flag.set() # Signal the output capture thread to terminate - output_thread.join() # Wait for the output capture thread to complete + # Start the ffmpeg process with subprocess.Popen + process = subprocess.Popen(ffmpeg_command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) + + # Start a thread to capture and print output + output_thread = threading.Thread(target=capture_output, args=(process, description)) + output_thread.start() + + try: + # Wait for ffmpeg process to complete + process.wait() + + except KeyboardInterrupt: + logging.error("Terminating ffmpeg process...") + + except Exception as e: + logging.error(f"Error in ffmpeg process: {e}") + + finally: + terminate_flag.set() # Signal the output capture thread to terminate + output_thread.join() # Wait for the output capture thread to complete + + except Exception as e: + logging.error(f"Failed to start ffmpeg process: {e}") diff --git a/Src/Lib/FFmpeg/command.py b/Src/Lib/FFmpeg/command.py index fc3819a..d92a744 100644 --- a/Src/Lib/FFmpeg/command.py +++ b/Src/Lib/FFmpeg/command.py @@ -19,6 +19,7 @@ except: pass # Internal utilities from Src.Util._jsonConfig import config_manager from Src.Util.os import check_file_existence +from Src.Util.console import console from .util import has_audio_stream, need_to_force_to_ts, check_ffmpeg_input from .capture import capture_ffmpeg_real_time @@ -284,6 +285,7 @@ def join_video(video_path: str, out_path: str, vcodec: str = None, acodec: str = # Add mpegts to force to detect input file as ts file if need_to_force_to_ts(video_path): + console.log("[red]Force input file to 'mpegts'.") ffmpeg_cmd.extend(['-f', 'mpegts']) vcodec = "libx264" @@ -317,6 +319,7 @@ def join_video(video_path: str, out_path: str, vcodec: str = None, acodec: str = # Check file if CHECK_OUTPUT_CONVERSION: + console.log("[red]Check output ffmpeg") time.sleep(0.5) check_ffmpeg_input(out_path) @@ -369,6 +372,7 @@ def join_audios(video_path: str, audio_tracks: List[Dict[str, str]], out_path: s # Check file if CHECK_OUTPUT_CONVERSION: + console.log("[red]Check output ffmpeg") time.sleep(0.5) check_ffmpeg_input(out_path) @@ -426,5 +430,6 @@ def join_subtitle(video_path: str, subtitles_list: List[Dict[str, str]], out_pat # Check file if CHECK_OUTPUT_CONVERSION: + console.log("[red]Check output ffmpeg") time.sleep(0.5) check_ffmpeg_input(out_path) diff --git a/Src/Lib/Hls/downloader.py b/Src/Lib/Hls/downloader.py index 40b006e..2eb6005 100644 --- a/Src/Lib/Hls/downloader.py +++ b/Src/Lib/Hls/downloader.py @@ -7,6 +7,10 @@ from datetime import datetime from concurrent.futures import ThreadPoolExecutor +# External library +from unidecode import unidecode + + # Internal utilities from Src.Lib.Request.my_requests import requests from Src.Util.headers import get_headers @@ -41,10 +45,6 @@ from .segments import M3U8_Segments from ..E_Table import report_table -# External library -from unidecode import unidecode as transliterate - - # Config DOWNLOAD_SPECIFIC_AUDIO = config_manager.get_list('M3U8_FILTER', 'specific_list_audio') DOWNLOAD_SPECIFIC_SUBTITLE = config_manager.get_list('M3U8_FILTER', 'specific_list_subtitles') @@ -89,7 +89,7 @@ class Downloader(): sys.exit(0) self.output_filename = os.path.join(folder, base_name) - self.output_filename = transliterate(self.output_filename) + self.output_filename = unidecode(self.output_filename) logging.info(f"Output filename: {self.output_filename}") diff --git a/config.json b/config.json index b5eeaa8..8e23ec8 100644 --- a/config.json +++ b/config.json @@ -3,8 +3,8 @@ "debug": false, "log_file": "app.log", "log_to_file": true, - "show_message": false, - "clean_console": false, + "show_message": true, + "clean_console": true, "root_path": "Video", "map_episode_name": "%(tv_name)_S%(season)E%(episode)_%(episode_name)", "create_job_database": false, diff --git a/run.py b/run.py index cfb87aa..c78722c 100644 --- a/run.py +++ b/run.py @@ -18,6 +18,7 @@ from Src.Upload.update import update as git_update from Src.Lib.FFmpeg import check_ffmpeg from Src.Util.logger import Logger + # Internal api from Src.Api.Streamingcommunity import main_film_series as streamingcommunity_film_serie from Src.Api.Animeunity import main_anime as streamingcommunity_anime From ae0b5bb577a9d02c91cecf498056ac05af6a6d7c Mon Sep 17 00:00:00 2001 From: Ghost <62809003+Ghost6446@users.noreply.github.com> Date: Mon, 27 May 2024 18:44:49 +0200 Subject: [PATCH 2/4] Fix github counter --- README.md | 50 +++++++++++++++++++++--------------- Src/Lib/E_Table/sql_table.py | 2 -- Src/Lib/FFmpeg/command.py | 3 +++ Src/Upload/update.py | 34 +++++++++++++----------- 4 files changed, 52 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index cb6b57d..76bddf9 100644 --- a/README.md +++ b/README.md @@ -53,38 +53,48 @@ python3 run.py You can change some behaviors by tweaking the configuration file. -### Options (DEFAULT) +
+ DEFAULT -* root_path: Path where the script will add movies and TV series folders (see [Path Examples](#Path-examples)). - - Default Value: media/streamingcommunity + * **root_path**: Path where the script will add movies and TV series folders (see [Path Examples](#Path-examples)). + - **Default Value**: `media/streamingcommunity` -* not_close: This option, when activated, prevents the script from closing after its initial execution, allowing it to restart automatically after completing the first run. - - Default Value: false + * **not_close**: When activated, prevents the script from closing after its initial execution, allowing it to restart automatically after completing the first run. + - **Default Value**: `false` -* map_episode_name: Mapping to choose the name of all episodes of TV Shows (see [Episode Name Usage](#Episode-name-usage)). - - Default Value: %(episode_name) - - Example Value: %(tv_name) [S%(season)] [E%(episode)] %(episode_name) + * **map_episode_name**: Mapping to choose the name of all episodes of TV Shows (see [Episode Name Usage](#Episode-name-usage)). + - **Default Value**: `%(episode_name)` + - **Example Value**: `%(tv_name) [S%(season)] [E%(episode)] %(episode_name)` +
-### Options (M3U8_DOWNLOAD) +
+ M3U8_DOWNLOAD -* tdqm_workers: The number of workers that will cooperate to download .ts files. **A high value may slow down your PC** - - Default Value: 20 + * **tdqm_workers**: The number of workers that will cooperate to download .ts files. **A high value may slow down your PC** + - **Default Value**: `20` -* tqdm_show_progress: Whether to show progress during downloads or not. - - Default Value: true + * **tqdm_show_progress**: Whether to show progress during downloads or not. + - **Default Value**: `true` -* create_report: When enabled, this option saves the name of the series or movie being downloaded along with the date and file size in a CSV file, providing a log of downloaded content. - - Default Value: false + * **create_report**: When enabled, saves the name of the series or movie being downloaded along with the date and file size in a CSV file, providing a log of downloaded content. + - **Default Value**: `false` +
-### Options (M3U8_FILTER) +
+ M3U8_FILTER -* cleanup_tmp_folder: Upon final conversion, this option ensures the removal of all unformatted audio, video tracks, and subtitles from the temporary folder, thereby maintaining cleanliness and efficiency. - - Default Value: true + * **cleanup_tmp_folder**: Upon final conversion, ensures the removal of all unformatted audio, video tracks, and subtitles from the temporary folder, thereby maintaining cleanliness and efficiency. + - **Default Value**: `true` -* specific_list_audio: A list of specific audio languages to download. - - Example Value: ['ara', 'baq', 'cat', 'chi', 'cze', 'dan', 'dut', 'eng', 'fil', 'fin', 'forced-ita', 'fre', 'ger', 'glg', 'gre', 'heb', 'hin', 'hun', 'ind', 'ita', 'jpn', 'kan', 'kor', 'mal', 'may', 'nob', 'nor', 'pol', 'por', 'rum', 'rus', 'spa', 'swe', 'tam', 'tel', 'tha', 'tur', 'ukr', 'vie'] + * **specific_list_audio**: A list of specific audio languages to download. + - **Example Value**: `['ara', 'baq', 'cat', 'chi', 'cze', 'dan', 'dut', 'eng', 'fil', 'fin', 'forced-ita', 'fre', 'ger', 'glg', 'gre', 'heb', 'hin', 'hun', 'ind', 'ita', 'jpn', 'kan', 'kor', 'mal', 'may', 'nob', 'nor', 'pol', 'por', 'rum', 'rus', 'spa', 'swe', 'tam', 'tel', 'tha', 'tur', 'ukr', 'vie']` + + * **check_output_conversion**: Verify if the conversion run by ffmpeg is free from corruption. + - **Default Value**: `false` + +
> [!IMPORTANT] diff --git a/Src/Lib/E_Table/sql_table.py b/Src/Lib/E_Table/sql_table.py index 45c5d03..728f0ab 100644 --- a/Src/Lib/E_Table/sql_table.py +++ b/Src/Lib/E_Table/sql_table.py @@ -3,8 +3,6 @@ import csv import logging -from typing import List - # Internal utilities from Src.Util._jsonConfig import config_manager diff --git a/Src/Lib/FFmpeg/command.py b/Src/Lib/FFmpeg/command.py index d92a744..282803d 100644 --- a/Src/Lib/FFmpeg/command.py +++ b/Src/Lib/FFmpeg/command.py @@ -275,6 +275,7 @@ def join_video(video_path: str, out_path: str, vcodec: str = None, acodec: str = """ if not check_file_existence(video_path): + logging.error("Missing input video for ffmpeg conversion.") sys.exit(0) # Start command @@ -340,6 +341,7 @@ def join_audios(video_path: str, audio_tracks: List[Dict[str, str]], out_path: s """ if not check_file_existence(video_path): + logging.error("Missing input video for ffmpeg conversion.") sys.exit(0) # Start command @@ -389,6 +391,7 @@ def join_subtitle(video_path: str, subtitles_list: List[Dict[str, str]], out_pat """ if not check_file_existence(video_path): + logging.error("Missing input video for ffmpeg conversion.") sys.exit(0) diff --git a/Src/Upload/update.py b/Src/Upload/update.py index 2e4f19a..328e542 100644 --- a/Src/Upload/update.py +++ b/Src/Upload/update.py @@ -31,29 +31,33 @@ def update(): console.print(f"[red]Error accessing GitHub API: {e}") return - # Get start of the reposity - stargazers_count = response_reposity['stargazers_count'] + # Get stargazers count from the repository + stargazers_count = response_reposity.get('stargazers_count', 0) - # Find info about latest versione deploy and the donwload count - last_version = response_releases[0]['name'] - down_count = response_releases[0]['assets'][0]['download_count'] + # Calculate total download count from all releases + total_download_count = sum(asset['download_count'] for release in response_releases for asset in release.get('assets', [])) - # Calculate percentual of start base on download count - if down_count > 0 and stargazers_count > 0: - percentual_stars = round(stargazers_count / down_count * 100, 2) + # Get latest version name + if response_releases: + last_version = response_releases[0].get('name', 'Unknown') + else: + last_version = 'Unknown' + + # Calculate percentual of stars based on download count + if total_download_count > 0 and stargazers_count > 0: + percentual_stars = round(stargazers_count / total_download_count * 100, 2) else: percentual_stars = 0 # Check installed version if __version__ != last_version: - console.print(f"[red]Version: [yellow]{last_version}") + console.print(f"[red]New version available: [yellow]{last_version}") else: - console.print(f"[red]Everything up to date") + console.print(f"[green]Everything is up to date") - print("\n") - console.print(f"[red]{repo_name} was downloaded [yellow]{down_count} [red]times, but only [yellow]{percentual_stars}% [red]of You(!!) have starred it.\n\ - [cyan]Help the repository grow today, by leaving a [yellow]star [cyan]and [yellow]sharing [cyan]it to others online!") + console.print("\n") + console.print(f"[red]{repo_name} has been downloaded [yellow]{total_download_count} [red]times, but only [yellow]{percentual_stars}% [red]of users have starred it.\n\ + [cyan]Help the repository grow today by leaving a [yellow]star [cyan]and [yellow]sharing [cyan]it with others online!") time.sleep(1) - print("\n") - + console.print("\n") From 80393c614765d883c7acfc1be53612e338410e47 Mon Sep 17 00:00:00 2001 From: Ghost <62809003+Ghost6446@users.noreply.github.com> Date: Mon, 27 May 2024 18:57:40 +0200 Subject: [PATCH 3/4] Update reame and config file. --- README.md | 72 +++++++++++++++++++++++--- Src/Api/Altadefinizione/__init__.py | 2 - Src/Api/Streamingcommunity/__init__.py | 3 -- Src/Lib/E_Table/__init__.py | 3 +- Src/Lib/E_Table/sql_table.py | 11 +--- Src/Lib/Hls/downloader.py | 4 +- Src/Lib/Hls/segments.py | 1 + config.json | 11 ++-- 8 files changed, 77 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 76bddf9..8351c86 100644 --- a/README.md +++ b/README.md @@ -56,15 +56,37 @@ You can change some behaviors by tweaking the configuration file.
DEFAULT + * **debug**: Enables or disables debug mode. + - **Default Value**: `false` + + * **log_file**: The file where logs will be written. + - **Default Value**: `app.log` + + * **clean_console**: Clears the console before the script runs. + - **Default Value**: `true` + * **root_path**: Path where the script will add movies and TV series folders (see [Path Examples](#Path-examples)). - - **Default Value**: `media/streamingcommunity` + - **Default Value**: `Video` + + * **map_episode_name**: Mapping to choose the name of all episodes of TV Shows (see [Episode Name Usage](#Episode-name-usage)). + - **Default Value**: `%(tv_name)_S%(season)E%(episode)_%(episode_name)` * **not_close**: When activated, prevents the script from closing after its initial execution, allowing it to restart automatically after completing the first run. - **Default Value**: `false` - * **map_episode_name**: Mapping to choose the name of all episodes of TV Shows (see [Episode Name Usage](#Episode-name-usage)). - - **Default Value**: `%(episode_name)` - - **Example Value**: `%(tv_name) [S%(season)] [E%(episode)] %(episode_name)` +
+ +
+ SITE + + * **streamingcommunity**: Configuration value for streamingcommunity site. + - **Default Value**: `foo` + + * **animeunity**: Configuration value for animeunity site. + - **Default Value**: `to` + + * **altadefinizione**: Configuration value for altadefinizione site. + - **Default Value**: `food`
@@ -72,7 +94,7 @@ You can change some behaviors by tweaking the configuration file. M3U8_DOWNLOAD * **tdqm_workers**: The number of workers that will cooperate to download .ts files. **A high value may slow down your PC** - - **Default Value**: `20` + - **Default Value**: `30` * **tqdm_show_progress**: Whether to show progress during downloads or not. - **Default Value**: `true` @@ -85,15 +107,53 @@ You can change some behaviors by tweaking the configuration file.
M3U8_FILTER + * **use_codec**: Whether to use a specific codec for processing. + - **Default Value**: `false` + + * **use_gpu**: Whether to use GPU acceleration. + - **Default Value**: `false` + + * **default_preset**: The default preset for ffmpeg conversion. + - **Default Value**: `ultrafast` + + * **check_output_conversion**: Verify if the conversion run by ffmpeg is free from corruption. + - **Default Value**: `false` + * **cleanup_tmp_folder**: Upon final conversion, ensures the removal of all unformatted audio, video tracks, and subtitles from the temporary folder, thereby maintaining cleanliness and efficiency. - **Default Value**: `true` * **specific_list_audio**: A list of specific audio languages to download. - **Example Value**: `['ara', 'baq', 'cat', 'chi', 'cze', 'dan', 'dut', 'eng', 'fil', 'fin', 'forced-ita', 'fre', 'ger', 'glg', 'gre', 'heb', 'hin', 'hun', 'ind', 'ita', 'jpn', 'kan', 'kor', 'mal', 'may', 'nob', 'nor', 'pol', 'por', 'rum', 'rus', 'spa', 'swe', 'tam', 'tel', 'tha', 'tur', 'ukr', 'vie']` - * **check_output_conversion**: Verify if the conversion run by ffmpeg is free from corruption. + * **specific_list_subtitles**: A list of specific subtitle languages to download. + - **Example Value**: `['eng']` + +
+ +
+ M3U8_REQUESTS + + * **disable_error**: Whether to disable error messages. - **Default Value**: `false` + * **timeout**: The timeout value for requests. + - **Default Value**: `10` + + * **verify_ssl**: Whether to verify SSL certificates. + - **Default Value**: `false` + +
+ +
+ M3U8_PARSER + + * **skip_empty_row_playlist**: Whether to skip empty rows in the playlist m3u8. + - **Default Value**: `false` + + * **force_resolution**: Forces the use of a specific resolution. `-1` means no forced resolution. + - **Default Value**: `-1` + - **Example Value**: `1080` +
diff --git a/Src/Api/Altadefinizione/__init__.py b/Src/Api/Altadefinizione/__init__.py index c64423d..901aa5f 100644 --- a/Src/Api/Altadefinizione/__init__.py +++ b/Src/Api/Altadefinizione/__init__.py @@ -34,5 +34,3 @@ def main_film(): url=select_title.url ) - # End - console.print("\n[red]Done") diff --git a/Src/Api/Streamingcommunity/__init__.py b/Src/Api/Streamingcommunity/__init__.py index a28e32a..e09b288 100644 --- a/Src/Api/Streamingcommunity/__init__.py +++ b/Src/Api/Streamingcommunity/__init__.py @@ -53,6 +53,3 @@ def main_film_series(): # If no media find else: console.print("[red]Cant find a single element") - - # End - console.print("\n[red]Done") \ No newline at end of file diff --git a/Src/Lib/E_Table/__init__.py b/Src/Lib/E_Table/__init__.py index 8bc03f3..e61ffb3 100644 --- a/Src/Lib/E_Table/__init__.py +++ b/Src/Lib/E_Table/__init__.py @@ -1,5 +1,4 @@ # 20.05.24 -from .sql_table import SimpleDBManager, report_table, job_database +from .sql_table import SimpleDBManager, report_table report_table: SimpleDBManager = report_table -job_database: SimpleDBManager = job_database diff --git a/Src/Lib/E_Table/sql_table.py b/Src/Lib/E_Table/sql_table.py index 728f0ab..6a10393 100644 --- a/Src/Lib/E_Table/sql_table.py +++ b/Src/Lib/E_Table/sql_table.py @@ -10,7 +10,6 @@ from Src.Util._jsonConfig import config_manager # Variable CREATE_REPORT = config_manager.get_bool('M3U8_DOWNLOAD', 'create_report') -CREATE_JOB_DB = config_manager.get_bool('DEFAULT', 'create_job_database') class SimpleDBManager: @@ -210,12 +209,4 @@ if CREATE_REPORT: report_table.load_database() report_table.save_database() else: - report_table = None - - -if CREATE_JOB_DB: - job_database = SimpleDBManager("Job_database.csv", ["Id", "Name", "Season_n"]) - job_database.load_database() - job_database.save_database() -else: - job_database = None \ No newline at end of file + report_table = None \ No newline at end of file diff --git a/Src/Lib/Hls/downloader.py b/Src/Lib/Hls/downloader.py index 2eb6005..6c41f82 100644 --- a/Src/Lib/Hls/downloader.py +++ b/Src/Lib/Hls/downloader.py @@ -460,9 +460,11 @@ class Downloader(): # Rename the output file to the desired output filename if not exist if not os.path.exists(self.output_filename): + + # Rename file converted to original set in init os.rename(out_path, self.output_filename) - print("\n") + # Print size of the file console.print(Panel(f"[bold green]Download completed![/bold green]\nFile size: [bold]{format_size(os.path.getsize(self.output_filename))}[/bold]", title=f"{os.path.basename(self.output_filename.replace('.mp4', ''))}", border_style="green")) # Delete all files except the output file diff --git a/Src/Lib/Hls/segments.py b/Src/Lib/Hls/segments.py index 18075fe..43b184f 100644 --- a/Src/Lib/Hls/segments.py +++ b/Src/Lib/Hls/segments.py @@ -302,6 +302,7 @@ class M3U8_Segments: ascii=' #', bar_format=f"{Colors.YELLOW}Downloading {Colors.WHITE}({add_desc}{Colors.WHITE}): {Colors.RED}{{percentage:.2f}}% {Colors.MAGENTA}{{bar}} {Colors.YELLOW}{{elapsed}} {Colors.WHITE}< {Colors.CYAN}{{remaining}}{{postfix}} {Colors.WHITE}]", dynamic_ncols=True, + ncols=80, mininterval=0.01 ) diff --git a/config.json b/config.json index 8e23ec8..1102a5e 100644 --- a/config.json +++ b/config.json @@ -7,14 +7,8 @@ "clean_console": true, "root_path": "Video", "map_episode_name": "%(tv_name)_S%(season)E%(episode)_%(episode_name)", - "create_job_database": false, "not_close": false }, - "SITE": { - "streamingcommunity": "foo", - "animeunity": "to", - "altadefinizione": "food" - }, "M3U8_DOWNLOAD": { "tdqm_workers": 30, "tqdm_show_progress": true, @@ -39,5 +33,10 @@ "M3U8_PARSER": { "skip_empty_row_playlist": false, "force_resolution": -1 + }, + "SITE": { + "streamingcommunity": "foo", + "animeunity": "to", + "altadefinizione": "food" } } \ No newline at end of file From b3e24e516093412684b406aefb383c8e1e3e2d92 Mon Sep 17 00:00:00 2001 From: Giova <62809003+Ghost6446@users.noreply.github.com> Date: Mon, 27 May 2024 19:00:14 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/README.md b/README.md index 8351c86..46d587f 100644 --- a/README.md +++ b/README.md @@ -76,20 +76,6 @@ You can change some behaviors by tweaking the configuration file. -
- SITE - - * **streamingcommunity**: Configuration value for streamingcommunity site. - - **Default Value**: `foo` - - * **animeunity**: Configuration value for animeunity site. - - **Default Value**: `to` - - * **altadefinizione**: Configuration value for altadefinizione site. - - **Default Value**: `food` - -
-
M3U8_DOWNLOAD