From da7f3fdbbdef9af80af01913d7b1afcd00a73060 Mon Sep 17 00:00:00 2001 From: Dark1291 Date: Wed, 26 Feb 2025 10:55:09 +0100 Subject: [PATCH] [UTIL] Remove "console.py" --- StreamingCommunity/Api/Player/vixcloud.py | 3 ++- StreamingCommunity/Api/Site/1337xx/__init__.py | 9 ++++++++- StreamingCommunity/Api/Site/1337xx/site.py | 3 ++- StreamingCommunity/Api/Site/1337xx/title.py | 5 ++++- StreamingCommunity/Api/Site/animeunity/__init__.py | 9 ++++++++- .../Api/Site/animeunity/film_serie.py | 8 +++++++- StreamingCommunity/Api/Site/animeunity/site.py | 3 ++- StreamingCommunity/Api/Site/cb01new/__init__.py | 9 ++++++++- StreamingCommunity/Api/Site/cb01new/film.py | 8 +++++++- StreamingCommunity/Api/Site/cb01new/site.py | 4 +++- .../Api/Site/ddlstreamitaly/__init__.py | 11 +++++++++-- .../Api/Site/ddlstreamitaly/series.py | 8 +++++++- StreamingCommunity/Api/Site/ddlstreamitaly/site.py | 3 ++- StreamingCommunity/Api/Site/guardaserie/__init__.py | 11 +++++++++-- StreamingCommunity/Api/Site/guardaserie/series.py | 10 +++++++++- StreamingCommunity/Api/Site/guardaserie/site.py | 6 ++++-- .../Api/Site/mostraguarda/__init__.py | 8 ++++++-- StreamingCommunity/Api/Site/mostraguarda/film.py | 6 +++++- .../Api/Site/streamingcommunity/__init__.py | 9 ++++++++- .../Api/Site/streamingcommunity/film.py | 9 ++++++++- .../Api/Site/streamingcommunity/series.py | 11 ++++++++++- .../Api/Site/streamingcommunity/site.py | 4 ++-- StreamingCommunity/Api/Template/Util/get_domain.py | 3 ++- StreamingCommunity/Api/Template/Util/manage_ep.py | 10 ++++++++-- StreamingCommunity/Api/Template/site.py | 5 +++-- StreamingCommunity/Lib/Downloader/HLS/downloader.py | 10 ++++------ StreamingCommunity/Lib/Downloader/HLS/segments.py | 5 ++++- StreamingCommunity/Lib/Downloader/MP4/downloader.py | 8 +++++++- StreamingCommunity/Lib/Downloader/TOR/downloader.py | 9 ++++++--- StreamingCommunity/Lib/FFmpeg/capture.py | 6 +++++- StreamingCommunity/Lib/FFmpeg/command.py | 7 +++++-- StreamingCommunity/Lib/FFmpeg/util.py | 7 +++++-- StreamingCommunity/Lib/M3U8/decryptor.py | 5 +++-- StreamingCommunity/Lib/TMBD/tmdb.py | 4 ++-- StreamingCommunity/Upload/update.py | 3 ++- StreamingCommunity/Util/console.py | 12 ------------ StreamingCommunity/Util/message.py | 7 ++++++- StreamingCommunity/Util/os.py | 7 ++++++- StreamingCommunity/run.py | 13 +++++++++---- update.py | 2 +- 40 files changed, 208 insertions(+), 72 deletions(-) delete mode 100644 StreamingCommunity/Util/console.py diff --git a/StreamingCommunity/Api/Player/vixcloud.py b/StreamingCommunity/Api/Player/vixcloud.py index 91c915f..50c2e31 100644 --- a/StreamingCommunity/Api/Player/vixcloud.py +++ b/StreamingCommunity/Api/Player/vixcloud.py @@ -8,11 +8,11 @@ from urllib.parse import urlparse, parse_qs, urlencode, urlunparse # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities from StreamingCommunity.Util.headers import get_userAgent -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from .Helper.Vixcloud.util import WindowVideo, WindowParameter, StreamsCollection from .Helper.Vixcloud.js_parser import JavaScriptParser @@ -20,6 +20,7 @@ from .Helper.Vixcloud.js_parser import JavaScriptParser # Variable MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout") +console = Console() class VideoSource: diff --git a/StreamingCommunity/Api/Site/1337xx/__init__.py b/StreamingCommunity/Api/Site/1337xx/__init__.py index e16f109..fef9569 100644 --- a/StreamingCommunity/Api/Site/1337xx/__init__.py +++ b/StreamingCommunity/Api/Site/1337xx/__init__.py @@ -3,8 +3,12 @@ from urllib.parse import quote_plus +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Api.Template import get_select_title @@ -21,6 +25,9 @@ _deprecate = False _priority = 2 _engineDownload = "tor" +console = Console() +msg = Prompt() + def search(string_to_search: str = None, get_onylDatabase: bool = False): """ diff --git a/StreamingCommunity/Api/Site/1337xx/site.py b/StreamingCommunity/Api/Site/1337xx/site.py index fae2d33..5c3ddec 100644 --- a/StreamingCommunity/Api/Site/1337xx/site.py +++ b/StreamingCommunity/Api/Site/1337xx/site.py @@ -5,10 +5,10 @@ import sys # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util.table import TVShowManager @@ -21,6 +21,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager # Variable +console = Console() media_search_manager = MediaManager() table_show_manager = TVShowManager() max_timeout = config_manager.get_int("REQUESTS", "timeout") diff --git a/StreamingCommunity/Api/Site/1337xx/title.py b/StreamingCommunity/Api/Site/1337xx/title.py index 1679622..ffd72f7 100644 --- a/StreamingCommunity/Api/Site/1337xx/title.py +++ b/StreamingCommunity/Api/Site/1337xx/title.py @@ -6,10 +6,10 @@ import os # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Util.message import start_message from StreamingCommunity.Util.headers import get_userAgent @@ -21,6 +21,9 @@ from StreamingCommunity.Api.Template.config_loader import site_constant from StreamingCommunity.Api.Template.Class.SearchType import MediaItem +# Variable +console = Console() + def download_title(select_title: MediaItem): """ diff --git a/StreamingCommunity/Api/Site/animeunity/__init__.py b/StreamingCommunity/Api/Site/animeunity/__init__.py index bc2113b..172bf2b 100644 --- a/StreamingCommunity/Api/Site/animeunity/__init__.py +++ b/StreamingCommunity/Api/Site/animeunity/__init__.py @@ -4,8 +4,12 @@ import sys import subprocess +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Api.Template import get_select_title from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance @@ -23,6 +27,9 @@ _deprecate = False _priority = 2 _engineDownload = "mp4" +msg = Prompt() +console = Console() + def search(string_to_search: str = None, get_onylDatabase: bool = False): diff --git a/StreamingCommunity/Api/Site/animeunity/film_serie.py b/StreamingCommunity/Api/Site/animeunity/film_serie.py index 3ebfeb0..a85dbec 100644 --- a/StreamingCommunity/Api/Site/animeunity/film_serie.py +++ b/StreamingCommunity/Api/Site/animeunity/film_serie.py @@ -5,8 +5,12 @@ import logging from typing import Tuple +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Util.message import start_message from StreamingCommunity.Lib.Downloader import MP4_downloader @@ -25,6 +29,8 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSourceAnime # Variable +console = Console() +msg = Prompt() KILL_HANDLER = bool(False) diff --git a/StreamingCommunity/Api/Site/animeunity/site.py b/StreamingCommunity/Api/Site/animeunity/site.py index 9e071c9..9f6cd21 100644 --- a/StreamingCommunity/Api/Site/animeunity/site.py +++ b/StreamingCommunity/Api/Site/animeunity/site.py @@ -7,10 +7,10 @@ import logging # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.table import TVShowManager from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance @@ -23,6 +23,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager # Variable +console = Console() media_search_manager = MediaManager() table_show_manager = TVShowManager() max_timeout = config_manager.get_int("REQUESTS", "timeout") diff --git a/StreamingCommunity/Api/Site/cb01new/__init__.py b/StreamingCommunity/Api/Site/cb01new/__init__.py index fdbe5ed..a8e2fb9 100644 --- a/StreamingCommunity/Api/Site/cb01new/__init__.py +++ b/StreamingCommunity/Api/Site/cb01new/__init__.py @@ -3,8 +3,12 @@ from urllib.parse import quote_plus +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Api.Template import get_select_title @@ -21,6 +25,9 @@ _deprecate = False _priority = 2 _engineDownload = "mp4" +msg = Prompt() +console = Console() + def search(string_to_search: str = None, get_onylDatabase: bool = False): """ diff --git a/StreamingCommunity/Api/Site/cb01new/film.py b/StreamingCommunity/Api/Site/cb01new/film.py index 949c3bb..a197529 100644 --- a/StreamingCommunity/Api/Site/cb01new/film.py +++ b/StreamingCommunity/Api/Site/cb01new/film.py @@ -3,8 +3,11 @@ import os +# External library +from rich.console import Console + + # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Util.message import start_message from StreamingCommunity.Lib.Downloader import HLS_Downloader @@ -19,6 +22,9 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem from StreamingCommunity.Api.Player.maxstream import VideoSource +# Variable +console = Console() + def download_film(select_title: MediaItem) -> str: """ diff --git a/StreamingCommunity/Api/Site/cb01new/site.py b/StreamingCommunity/Api/Site/cb01new/site.py index cc16ac6..66c2d52 100644 --- a/StreamingCommunity/Api/Site/cb01new/site.py +++ b/StreamingCommunity/Api/Site/cb01new/site.py @@ -2,13 +2,14 @@ import sys + # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util.table import TVShowManager @@ -21,6 +22,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager # Variable +console = Console() media_search_manager = MediaManager() table_show_manager = TVShowManager() max_timeout = config_manager.get_int("REQUESTS", "timeout") diff --git a/StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py b/StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py index 69bb417..3bb93de 100644 --- a/StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py +++ b/StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py @@ -4,13 +4,17 @@ import logging from urllib.parse import quote_plus +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Api.Template import get_select_title +from StreamingCommunity.Api.Template.config_loader import site_constant # Logic class -from StreamingCommunity.Api.Template.config_loader import site_constant from .site import title_search, media_search_manager, table_show_manager from .series import download_thread @@ -22,6 +26,9 @@ _deprecate = False _priority = 2 _engineDownload = "mp4" +msg = Prompt() +console = Console() + def search(string_to_search: str = None, get_onylDatabase: bool = False): """ diff --git a/StreamingCommunity/Api/Site/ddlstreamitaly/series.py b/StreamingCommunity/Api/Site/ddlstreamitaly/series.py index daf3363..e56a416 100644 --- a/StreamingCommunity/Api/Site/ddlstreamitaly/series.py +++ b/StreamingCommunity/Api/Site/ddlstreamitaly/series.py @@ -5,8 +5,11 @@ from urllib.parse import urlparse from typing import Tuple +# External library +from rich.console import Console + + # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.message import start_message from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Lib.Downloader import MP4_downloader @@ -28,6 +31,9 @@ from .util.ScrapeSerie import GetSerieInfo from StreamingCommunity.Api.Player.ddl import VideoSource +# Variable +console = Console() + def download_video(index_episode_selected: int, scape_info_serie: GetSerieInfo, video_source: VideoSource) -> Tuple[str,bool]: """ diff --git a/StreamingCommunity/Api/Site/ddlstreamitaly/site.py b/StreamingCommunity/Api/Site/ddlstreamitaly/site.py index d3a321a..6f5d411 100644 --- a/StreamingCommunity/Api/Site/ddlstreamitaly/site.py +++ b/StreamingCommunity/Api/Site/ddlstreamitaly/site.py @@ -7,10 +7,10 @@ import logging # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util.table import TVShowManager @@ -23,6 +23,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager # Variable +console = Console() media_search_manager = MediaManager() table_show_manager = TVShowManager() max_timeout = config_manager.get_int("REQUESTS", "timeout") diff --git a/StreamingCommunity/Api/Site/guardaserie/__init__.py b/StreamingCommunity/Api/Site/guardaserie/__init__.py index 4bc4520..89d3400 100644 --- a/StreamingCommunity/Api/Site/guardaserie/__init__.py +++ b/StreamingCommunity/Api/Site/guardaserie/__init__.py @@ -3,13 +3,17 @@ from urllib.parse import quote_plus +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Api.Template import get_select_title +from StreamingCommunity.Api.Template.config_loader import site_constant # Logic class -from StreamingCommunity.Api.Template.config_loader import site_constant from .site import title_search, media_search_manager, table_show_manager from .series import download_series @@ -21,6 +25,9 @@ _deprecate = False _priority = 2 _engineDownload = "hls" +msg = Prompt() +console = Console() + def search(string_to_search: str = None, get_onylDatabase: bool = False): """ diff --git a/StreamingCommunity/Api/Site/guardaserie/series.py b/StreamingCommunity/Api/Site/guardaserie/series.py index 9a63d8f..aaf38e9 100644 --- a/StreamingCommunity/Api/Site/guardaserie/series.py +++ b/StreamingCommunity/Api/Site/guardaserie/series.py @@ -4,8 +4,12 @@ import os from typing import Tuple +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Util.message import start_message from StreamingCommunity.Lib.Downloader import HLS_Downloader @@ -28,6 +32,10 @@ from .util.ScrapeSerie import GetSerieInfo from StreamingCommunity.Api.Player.supervideo import VideoSource +# Variable +msg = Prompt() +console = Console() + def download_video(index_season_selected: int, index_episode_selected: int, scape_info_serie: GetSerieInfo) -> Tuple[str,bool]: """ diff --git a/StreamingCommunity/Api/Site/guardaserie/site.py b/StreamingCommunity/Api/Site/guardaserie/site.py index 7732f0f..bee6d52 100644 --- a/StreamingCommunity/Api/Site/guardaserie/site.py +++ b/StreamingCommunity/Api/Site/guardaserie/site.py @@ -2,13 +2,13 @@ import sys + # External libraries import httpx from bs4 import BeautifulSoup - +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util.table import TVShowManager @@ -21,11 +21,13 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager # Variable +console = Console() media_search_manager = MediaManager() table_show_manager = TVShowManager() max_timeout = config_manager.get_int("REQUESTS", "timeout") + def title_search(word_to_search: str) -> int: """ Search for titles based on a search query. diff --git a/StreamingCommunity/Api/Site/mostraguarda/__init__.py b/StreamingCommunity/Api/Site/mostraguarda/__init__.py index a9cf4e4..e927ce0 100644 --- a/StreamingCommunity/Api/Site/mostraguarda/__init__.py +++ b/StreamingCommunity/Api/Site/mostraguarda/__init__.py @@ -3,8 +3,9 @@ from urllib.parse import quote_plus -# Internal utilities -from StreamingCommunity.Util.console import console, msg +# External library +from rich.console import Console +from rich.prompt import Prompt, Confirm # Logic class @@ -20,6 +21,9 @@ _deprecate = False _priority = 2 _engineDownload = "hls" +msg = Prompt() +console = Console() + def search(string_to_search: str = None, get_onylDatabase: bool = False): """ diff --git a/StreamingCommunity/Api/Site/mostraguarda/film.py b/StreamingCommunity/Api/Site/mostraguarda/film.py index a27d278..507f6d4 100644 --- a/StreamingCommunity/Api/Site/mostraguarda/film.py +++ b/StreamingCommunity/Api/Site/mostraguarda/film.py @@ -7,10 +7,10 @@ import logging # External libraries import httpx from bs4 import BeautifulSoup +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Util.message import start_message from StreamingCommunity.Util.headers import get_userAgent @@ -27,6 +27,10 @@ from StreamingCommunity.Api.Template.config_loader import site_constant from StreamingCommunity.Lib.TMBD import Json_film +# Variable +console = Console() + + def download_film(movie_details: Json_film) -> str: """ Downloads a film using the provided tmbd id. diff --git a/StreamingCommunity/Api/Site/streamingcommunity/__init__.py b/StreamingCommunity/Api/Site/streamingcommunity/__init__.py index 4492c2f..6fbc067 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/__init__.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/__init__.py @@ -5,8 +5,12 @@ import subprocess from urllib.parse import quote_plus +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Api.Template import get_select_title from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance @@ -25,6 +29,9 @@ _deprecate = False _priority = 1 _engineDownload = "hls" +msg = Prompt() +console = Console() + def search(string_to_search: str = None, get_onylDatabase: bool = False): """ diff --git a/StreamingCommunity/Api/Site/streamingcommunity/film.py b/StreamingCommunity/Api/Site/streamingcommunity/film.py index c4a76a0..ec6d1d1 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/film.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/film.py @@ -3,8 +3,11 @@ import os +# External library +from rich.console import Console + + # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Util.message import start_message from StreamingCommunity.Lib.Downloader import HLS_Downloader @@ -20,6 +23,10 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem from StreamingCommunity.Api.Player.vixcloud import VideoSource +# Variable +console = Console() + + def download_film(select_title: MediaItem) -> str: """ Downloads a film using the provided film ID, title name, and domain. diff --git a/StreamingCommunity/Api/Site/streamingcommunity/series.py b/StreamingCommunity/Api/Site/streamingcommunity/series.py index 53aa659..ec60d7d 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/series.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/series.py @@ -4,8 +4,12 @@ import os from typing import Tuple +# External library +from rich.console import Console +from rich.prompt import Prompt, Confirm + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Util.message import start_message from StreamingCommunity.Lib.Downloader import HLS_Downloader from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance @@ -28,6 +32,11 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem from StreamingCommunity.Api.Player.vixcloud import VideoSource +# Variable +msg = Prompt() +console = Console() + + def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: ScrapeSerie, video_source: VideoSource) -> Tuple[str,bool]: """ Download a single episode video. diff --git a/StreamingCommunity/Api/Site/streamingcommunity/site.py b/StreamingCommunity/Api/Site/streamingcommunity/site.py index 0915a6b..6fcece8 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/site.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/site.py @@ -5,10 +5,10 @@ import sys # External libraries import httpx +from rich.console import Console # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util.table import TVShowManager @@ -21,8 +21,8 @@ from StreamingCommunity.Api.Template.Util import search_domain from StreamingCommunity.Api.Template.Class.SearchType import MediaManager - # Variable +console = Console() media_search_manager = MediaManager() table_show_manager = TVShowManager() max_timeout = config_manager.get_int("REQUESTS", "timeout") diff --git a/StreamingCommunity/Api/Template/Util/get_domain.py b/StreamingCommunity/Api/Template/Util/get_domain.py index 45e8dd5..65cda2e 100644 --- a/StreamingCommunity/Api/Template/Util/get_domain.py +++ b/StreamingCommunity/Api/Template/Util/get_domain.py @@ -7,15 +7,16 @@ from urllib.parse import urlparse, unquote # External libraries import httpx +from rich.console import Console # Internal utilities from StreamingCommunity.Util.headers import get_headers -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager # Variable +console = Console() VERIFY = config_manager.get("REQUESTS", "verify") diff --git a/StreamingCommunity/Api/Template/Util/manage_ep.py b/StreamingCommunity/Api/Template/Util/manage_ep.py index 38505a8..0172e4a 100644 --- a/StreamingCommunity/Api/Template/Util/manage_ep.py +++ b/StreamingCommunity/Api/Template/Util/manage_ep.py @@ -5,14 +5,20 @@ import logging from typing import List +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Util.os import os_manager from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.table import TVShowManager -# Config +# Variable +msg = Prompt() +console = Console() MAP_EPISODE = config_manager.get('OUT_FOLDER', 'map_episode_name') diff --git a/StreamingCommunity/Api/Template/site.py b/StreamingCommunity/Api/Template/site.py index 30aa5d9..613dbeb 100644 --- a/StreamingCommunity/Api/Template/site.py +++ b/StreamingCommunity/Api/Template/site.py @@ -3,11 +3,12 @@ import sys -# Internal utilities -from StreamingCommunity.Util.console import console +# External library +from rich.console import Console # Variable +console = Console() available_colors = ['red', 'magenta', 'yellow', 'cyan', 'green', 'blue', 'white'] column_to_hide = ['Slug', 'Sub_ita', 'Last_air_date', 'Seasons_count', 'Url'] diff --git a/StreamingCommunity/Lib/Downloader/HLS/downloader.py b/StreamingCommunity/Lib/Downloader/HLS/downloader.py index 782be05..2277da0 100644 --- a/StreamingCommunity/Lib/Downloader/HLS/downloader.py +++ b/StreamingCommunity/Lib/Downloader/HLS/downloader.py @@ -10,17 +10,14 @@ from typing import Any, Dict, List, Optional # External libraries import httpx +from rich.console import Console +from rich.panel import Panel # Internal utilities from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent -from StreamingCommunity.Util.console import console, Panel -from StreamingCommunity.Util.os import ( - compute_sha1_hash, - os_manager, - internet_manager -) +from StreamingCommunity.Util.os import compute_sha1_hash, os_manager, internet_manager from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance @@ -49,6 +46,7 @@ RETRY_LIMIT = config_manager.get_int('REQUESTS', 'max_retry') MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout") TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot') +console = Console() class HLSClient: diff --git a/StreamingCommunity/Lib/Downloader/HLS/segments.py b/StreamingCommunity/Lib/Downloader/HLS/segments.py index c982754..d367dc5 100644 --- a/StreamingCommunity/Lib/Downloader/HLS/segments.py +++ b/StreamingCommunity/Lib/Downloader/HLS/segments.py @@ -17,11 +17,11 @@ from typing import Dict # External libraries import httpx from tqdm import tqdm +from rich.console import Console # Internal utilities from StreamingCommunity.Util.color import Colors -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.os import os_manager @@ -48,6 +48,9 @@ SEGMENT_MAX_TIMEOUT = config_manager.get_int("M3U8_DOWNLOAD", "segment_timeout") TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot') +# Variable +console = Console() + class M3U8_Segments: def __init__(self, url: str, tmp_folder: str, is_index_url: bool = True): diff --git a/StreamingCommunity/Lib/Downloader/MP4/downloader.py b/StreamingCommunity/Lib/Downloader/MP4/downloader.py index 0955b4c..26a062d 100644 --- a/StreamingCommunity/Lib/Downloader/MP4/downloader.py +++ b/StreamingCommunity/Lib/Downloader/MP4/downloader.py @@ -12,12 +12,14 @@ from functools import partial # External libraries import httpx from tqdm import tqdm +from rich.console import Console +from rich.prompt import Prompt +from rich.panel import Panel # Internal utilities from StreamingCommunity.Util.headers import get_userAgent from StreamingCommunity.Util.color import Colors -from StreamingCommunity.Util.console import console, Panel from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.os import internet_manager from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance @@ -34,6 +36,10 @@ REQUEST_TIMEOUT = config_manager.get_float('REQUESTS', 'timeout') TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot') +# Variable +msg = Prompt() +console = Console() + class InterruptHandler: def __init__(self): diff --git a/StreamingCommunity/Lib/Downloader/TOR/downloader.py b/StreamingCommunity/Lib/Downloader/TOR/downloader.py index 1d7e290..2bcedef 100644 --- a/StreamingCommunity/Lib/Downloader/TOR/downloader.py +++ b/StreamingCommunity/Lib/Downloader/TOR/downloader.py @@ -9,10 +9,13 @@ import psutil import logging +# External library +from rich.console import Console + + # Internal utilities from StreamingCommunity.Util.color import Colors from StreamingCommunity.Util.os import internet_manager -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager @@ -28,10 +31,10 @@ USERNAME = config_manager.get_dict('QBIT_CONFIG', 'user') PASSWORD = config_manager.get_dict('QBIT_CONFIG', 'pass') -# Config +# Variable USE_LARGE_BAR = not ("android" in sys.platform or "ios" in sys.platform) REQUEST_TIMEOUT = config_manager.get_float('REQUESTS', 'timeout') - +console = Console() class TOR_downloader: diff --git a/StreamingCommunity/Lib/FFmpeg/capture.py b/StreamingCommunity/Lib/FFmpeg/capture.py index c1fd2cf..f43ff49 100644 --- a/StreamingCommunity/Lib/FFmpeg/capture.py +++ b/StreamingCommunity/Lib/FFmpeg/capture.py @@ -6,12 +6,16 @@ import threading import subprocess +# External library +from rich.console import Console + + # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.os import internet_manager # Variable +console = Console() terminate_flag = threading.Event() diff --git a/StreamingCommunity/Lib/FFmpeg/command.py b/StreamingCommunity/Lib/FFmpeg/command.py index 7131bf0..4c3c996 100644 --- a/StreamingCommunity/Lib/FFmpeg/command.py +++ b/StreamingCommunity/Lib/FFmpeg/command.py @@ -6,10 +6,13 @@ import subprocess from typing import List, Dict, Tuple, Optional +# External library +from rich.console import Console + + # Internal utilities from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.os import os_manager, os_summary, suppress_output -from StreamingCommunity.Util.console import console # Logic class @@ -32,7 +35,7 @@ FFMPEG_DEFAULT_PRESET = config_manager.get("M3U8_CONVERSION", "default_preset") # Variable USE_LARGE_BAR = not ("android" in sys.platform or "ios" in sys.platform) FFMPEG_PATH = os_summary.ffmpeg_path - +console = Console() def check_subtitle_encoders() -> Tuple[Optional[bool], Optional[bool]]: diff --git a/StreamingCommunity/Lib/FFmpeg/util.py b/StreamingCommunity/Lib/FFmpeg/util.py index 82fa0d9..6241028 100644 --- a/StreamingCommunity/Lib/FFmpeg/util.py +++ b/StreamingCommunity/Lib/FFmpeg/util.py @@ -8,14 +8,17 @@ import logging from typing import Tuple +# External library +from rich.console import Console + + # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util.os import os_summary # Variable FFPROB_PATH = os_summary.ffprobe_path - +console = Console() def has_audio_stream(video_path: str) -> bool: diff --git a/StreamingCommunity/Lib/M3U8/decryptor.py b/StreamingCommunity/Lib/M3U8/decryptor.py index 65a9cfc..6981910 100644 --- a/StreamingCommunity/Lib/M3U8/decryptor.py +++ b/StreamingCommunity/Lib/M3U8/decryptor.py @@ -6,11 +6,12 @@ import logging import importlib.util -# Internal utilities -from StreamingCommunity.Util.console import console +# External library +from rich.console import Console # Check if Cryptodome module is installed +console = Console() crypto_spec = importlib.util.find_spec("Cryptodome") crypto_installed = crypto_spec is not None diff --git a/StreamingCommunity/Lib/TMBD/tmdb.py b/StreamingCommunity/Lib/TMBD/tmdb.py index 0647880..c90c479 100644 --- a/StreamingCommunity/Lib/TMBD/tmdb.py +++ b/StreamingCommunity/Lib/TMBD/tmdb.py @@ -6,22 +6,22 @@ from typing import Dict # External libraries import httpx +from rich.console import Console # Internal utilities from .obj_tmbd import Json_film -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.table import TVShowManager # Variable +console = Console() table_show_manager = TVShowManager() api_key = "a800ed6c93274fb857ea61bd9e7256c5" MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout") - def get_select_title(table_show_manager, generic_obj): """ Display a selection of titles and prompt the user to choose one. diff --git a/StreamingCommunity/Upload/update.py b/StreamingCommunity/Upload/update.py index f562ec8..88644db 100644 --- a/StreamingCommunity/Upload/update.py +++ b/StreamingCommunity/Upload/update.py @@ -7,11 +7,11 @@ import time # External library import httpx +from rich.console import Console # Internal utilities from .version import __version__, __author__, __title__ -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.headers import get_userAgent @@ -22,6 +22,7 @@ if getattr(sys, 'frozen', False): # Modalità PyInstaller base_path = os.path.join(sys._MEIPASS, "StreamingCommunity") else: base_path = os.path.dirname(__file__) +console = Console() def update(): diff --git a/StreamingCommunity/Util/console.py b/StreamingCommunity/Util/console.py deleted file mode 100644 index 2ad1f8d..0000000 --- a/StreamingCommunity/Util/console.py +++ /dev/null @@ -1,12 +0,0 @@ -# 24.02.24 - -from rich.console import Console -from rich.prompt import Prompt, Confirm -from rich.panel import Panel -from rich.table import Table -from rich.text import Text - - -# Variable -msg = Prompt() -console = Console() \ No newline at end of file diff --git a/StreamingCommunity/Util/message.py b/StreamingCommunity/Util/message.py index 3f8b0b1..57352b7 100644 --- a/StreamingCommunity/Util/message.py +++ b/StreamingCommunity/Util/message.py @@ -3,12 +3,17 @@ import os import platform + +# External library +from rich.console import Console + + # Internal utilities -from StreamingCommunity.Util.console import console from StreamingCommunity.Util._jsonConfig import config_manager # Variable +console = Console() CLEAN = config_manager.get_bool('DEFAULT', 'clean_console') SHOW = config_manager.get_bool('DEFAULT', 'show_message') diff --git a/StreamingCommunity/Util/os.py b/StreamingCommunity/Util/os.py index 7af4db7..ce91c3c 100644 --- a/StreamingCommunity/Util/os.py +++ b/StreamingCommunity/Util/os.py @@ -18,14 +18,19 @@ from pathlib import Path # External library import httpx from unidecode import unidecode +from rich.console import Console +from rich.prompt import Prompt from pathvalidate import sanitize_filename, sanitize_filepath # Internal utilities from .ffmpeg_installer import check_ffmpeg -from StreamingCommunity.Util.console import console, msg +# Variable +msg = Prompt() +console = Console() + class OsManager: def __init__(self): diff --git a/StreamingCommunity/run.py b/StreamingCommunity/run.py index 28cd327..74069c5 100644 --- a/StreamingCommunity/run.py +++ b/StreamingCommunity/run.py @@ -12,17 +12,18 @@ import threading, asyncio from typing import Callable +# External library +from rich.console import Console +from rich.prompt import Prompt + + # Internal utilities from StreamingCommunity.Util.message import start_message -from StreamingCommunity.Util.console import console, msg from StreamingCommunity.Util._jsonConfig import config_manager from StreamingCommunity.Util.os import os_summary from StreamingCommunity.Util.logger import Logger from StreamingCommunity.Upload.update import update as git_update from StreamingCommunity.Lib.TMBD import tmdb - - -# Telegram util from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession @@ -32,6 +33,10 @@ CLOSE_CONSOLE = config_manager.get_bool('DEFAULT', 'not_close') TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot') +# Variable +console = Console() +msg = Prompt() + def run_function(func: Callable[..., None], close_console: bool = False, search_terms: str = None) -> None: """ diff --git a/update.py b/update.py index 133e196..9f9a1bd 100644 --- a/update.py +++ b/update.py @@ -16,7 +16,7 @@ from rich.table import Table # Variable -max_timeout = 20 +max_timeout = 15 console = Console() local_path = os.path.join(".") from StreamingCommunity.Upload.version import __author__, __title__