StreamingCommunity 2.7.0__py3-none-any.whl → 2.9.0__py3-none-any.whl

StreamingCommunity/Api/Template/Util/get_domain.py

@@ -1,20 +1,24 @@
 # 18.06.24
 
-import ssl
-import time
+import certifi
 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
+from StreamingCommunity.Util.config_json import config_manager
 
 
+# Variable
+console = Console()
+VERIFY = config_manager.get("REQUESTS", "verify")
+MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
+
 
 def get_tld(url_str):
     """Extract the TLD (Top-Level Domain) from the URL."""
@@ -50,16 +54,7 @@ def get_base_domain(url_str):
     except Exception:
         return None
     
-def get_base_url(url_str):
-    """Extract base URL including protocol and domain, removing path and query parameters."""
-    try:
-        parsed = urlparse(url_str)
-        return f"{parsed.scheme}://{parsed.netloc}"
-    
-    except Exception:
-        return None
-
-def validate_url(url, base_url, max_timeout, max_retries=2, sleep=1):
+def validate_url(url, base_url):
     """Validate if URL is accessible and matches expected base domain."""
     console.print(f"\n[cyan]Starting validation for URL[white]: [yellow]{url}")
     
@@ -71,71 +66,34 @@ def validate_url(url, base_url, max_timeout, max_retries=2, sleep=1):
         console.print(f"[red]Domain structure mismatch: {url_domain} != {base_domain}")
         return False, None
     
-    # Count dots to ensure we don't have extra subdomains
-    base_dots = base_url.count('.')
-    url_dots = url.count('.')
-    if url_dots > base_dots + 1:
-        console.print(f"[red]Too many subdomains in URL")
-        return False, None
-
     client = httpx.Client(
-        verify=False,
+        verify=VERIFY,
         headers=get_headers(),
-        timeout=max_timeout
+        timeout=MAX_TIMEOUT
     )
 
-    for retry in range(max_retries):
-        try:
-            time.sleep(sleep)
-            
-            # Initial check without redirects
-            response = client.get(url, follow_redirects=False)
-            if response.status_code == 403:
-                console.print(f"[red]Check failed (403) - Attempt {retry + 1}/{max_retries}")
-                continue
-                
-            if response.status_code >= 400:
-                console.print(f"[red]Check failed: HTTP {response.status_code}")
-                return False, None
-                
-            # Follow redirects and verify final domain
-            final_response = client.get(url, follow_redirects=True)
-            final_domain = get_base_domain(str(final_response.url))
-            console.print(f"[cyan]Redirect url: [red]{final_response.url}")
-            
-            if final_domain != base_domain:
-                console.print(f"[red]Final domain mismatch: {final_domain} != {base_domain}")
-                return False, None
-                
-            new_tld = get_tld(str(final_response.url))
-            if new_tld != get_tld(url):
-                return True, new_tld
-                
-            return True, None
-            
-        except (httpx.RequestError, ssl.SSLError) as e:
-            console.print(f"[red]Connection error: {str(e)}")
-            time.sleep(sleep)
-            continue
-            
-    return False, None
+    # Make request to web site
+    response = client.get(url, follow_redirects=False)
+        
+    if response.status_code >= 400:
+        console.print(f"[red]Check failed: HTTP {response.status_code}")
+        console.print(f"[red]Response content: {response.text}")
+        return False, None
+        
+    return True, base_domain
 
 def search_domain(site_name: str, base_url: str, get_first: bool = False):
-    """Search for valid domain matching site name and base URL."""
-    max_timeout = config_manager.get_int("REQUESTS", "timeout")
-    
+    """Search for valid domain matching site name and base URL."""    
     try:
-        is_correct, redirect_tld = validate_url(base_url, base_url, max_timeout)
+        is_correct, redirect_tld = validate_url(base_url, base_url)
 
         if is_correct:
             tld = redirect_tld or get_tld(base_url)
-            config_manager.configSite[site_name]['domain'] = tld
-
-            console.print(f"[green]Successfully validated initial URL")
             return tld, base_url
         
         else:
             return None, None
         
     except Exception as e:
-        console.print(f"[red]Error testing initial URL: {str(e)}")
+        console.print(f"[red]Error testing initial URL: {str(e)}")
+        return None, None

StreamingCommunity/Api/Template/Util/manage_ep.py

@@ -5,15 +5,21 @@ 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.config_json import config_manager
 from StreamingCommunity.Util.table import TVShowManager
 
 
-# Config
-MAP_EPISODE = config_manager.get('DEFAULT', 'map_episode_name')
+# Variable
+msg = Prompt()
+console = Console()
+MAP_EPISODE = config_manager.get('OUT_FOLDER', 'map_episode_name')
 
 
 def dynamic_format_number(n: int) -> str:
@@ -195,7 +201,6 @@ def display_episodes_list(episodes_manager) -> str:
     """
     # Set up table for displaying episodes
     table_show_manager = TVShowManager()
-    table_show_manager.set_slice_end(10)
 
     # Add columns to the table
     column_info = {

StreamingCommunity/Api/Template/config_loader.py

@@ -5,7 +5,7 @@ import inspect
 
 
 # Internal utilities
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 
 
 def get_site_name_from_stack():
@@ -29,7 +29,7 @@ class SiteConstant:
     
     @property
     def ROOT_PATH(self):
-        return config_manager.get('DEFAULT', 'root_path')
+        return config_manager.get('OUT_FOLDER', 'root_path')
     
     @property
     def DOMAIN_NOW(self):
@@ -42,23 +42,23 @@ class SiteConstant:
     @property
     def SERIES_FOLDER(self):
         base_path = self.ROOT_PATH
-        if config_manager.get_bool("DEFAULT", "add_siteName"):
+        if config_manager.get_bool("OUT_FOLDER", "add_siteName"):
             base_path = os.path.join(base_path, self.SITE_NAME)
-        return os.path.join(base_path, config_manager.get('DEFAULT', 'serie_folder_name'))
+        return os.path.join(base_path, config_manager.get('OUT_FOLDER', 'serie_folder_name'))
     
     @property
     def MOVIE_FOLDER(self):
         base_path = self.ROOT_PATH
-        if config_manager.get_bool("DEFAULT", "add_siteName"):
+        if config_manager.get_bool("OUT_FOLDER", "add_siteName"):
             base_path = os.path.join(base_path, self.SITE_NAME)
-        return os.path.join(base_path, config_manager.get('DEFAULT', 'movie_folder_name'))
+        return os.path.join(base_path, config_manager.get('OUT_FOLDER', 'movie_folder_name'))
     
     @property
     def ANIME_FOLDER(self):
         base_path = self.ROOT_PATH
-        if config_manager.get_bool("DEFAULT", "add_siteName"):
+        if config_manager.get_bool("OUT_FOLDER", "add_siteName"):
             base_path = os.path.join(base_path, self.SITE_NAME)
-        return os.path.join(base_path, config_manager.get('DEFAULT', 'anime_folder_name'))
+        return os.path.join(base_path, config_manager.get('OUT_FOLDER', 'anime_folder_name'))
     
     @property
     def COOKIE(self):

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']
 
@@ -19,10 +20,6 @@ def get_select_title(table_show_manager, media_search_manager):
     Returns:
         MediaItem: The selected media item.
     """
-
-    # Set up table for displaying titles
-    table_show_manager.set_slice_end(10)
-
     # Determine column_info dynamically for (search site)
     if not media_search_manager.media_list:
         console.print("\n[red]No media items available.")

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.config_json 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
 
 
@@ -47,9 +44,9 @@ FILTER_CUSTOM_REOLUTION = str(config_manager.get('M3U8_PARSER', 'force_resolutio
 GET_ONLY_LINK = config_manager.get_bool('M3U8_PARSER', 'get_only_link')
 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:
@@ -100,7 +97,7 @@ class PathManager:
         Creates a hash-based filename if no path is provided.
         """
         if not path:
-            root = config_manager.get('DEFAULT', 'root_path')
+            root = config_manager.get('OUT_FOLDER', 'root_path')
             hash_name = compute_sha1_hash(self.m3u8_url) + ".mp4"
             return os.path.join(root, "undefined", hash_name)
 
@@ -193,7 +190,7 @@ class M3U8Manager:
         list_available_resolution = [f"{r[0]}x{r[1]}" for r in tuple_available_resolution]
 
         console.print(
-            f"[cyan bold]Video    →[/cyan bold] [green]Available:[/green] [purple]{', '.join(list_available_resolution)}[/purple] | "
+            f"[cyan bold]Video    [/cyan bold] [green]Available:[/green] [purple]{', '.join(list_available_resolution)}[/purple] | "
             f"[red]Set:[/red] [purple]{FILTER_CUSTOM_REOLUTION}[/purple] | "
             f"[yellow]Downloadable:[/yellow] [purple]{self.video_res[0]}x{self.video_res[1]}[/purple]"
         )
@@ -208,7 +205,7 @@ class M3U8Manager:
             set_codec_info = available_codec_info if config_manager.get_bool("M3U8_CONVERSION", "use_codec") else "[purple]copy[/purple]"
 
             console.print(
-                f"[bold cyan]Codec    →[/bold cyan] [green]Available:[/green] {available_codec_info} | "
+                f"[bold cyan]Codec    [/bold cyan] [green]Available:[/green] {available_codec_info} | "
                 f"[red]Set:[/red] {set_codec_info}"
             )
 
@@ -217,7 +214,7 @@ class M3U8Manager:
         downloadable_sub_languages = list(set(available_sub_languages) & set(DOWNLOAD_SPECIFIC_SUBTITLE))
         if available_sub_languages:
             console.print(
-                f"[cyan bold]Subtitle →[/cyan bold] [green]Available:[/green] [purple]{', '.join(available_sub_languages)}[/purple] | "
+                f"[cyan bold]Subtitle [/cyan bold] [green]Available:[/green] [purple]{', '.join(available_sub_languages)}[/purple] | "
                 f"[red]Set:[/red] [purple]{', '.join(DOWNLOAD_SPECIFIC_SUBTITLE)}[/purple] | "
                 f"[yellow]Downloadable:[/yellow] [purple]{', '.join(downloadable_sub_languages)}[/purple]"
             )
@@ -227,7 +224,7 @@ class M3U8Manager:
         downloadable_audio_languages = list(set(available_audio_languages) & set(DOWNLOAD_SPECIFIC_AUDIO))
         if available_audio_languages:
             console.print(
-                f"[cyan bold]Audio    →[/cyan bold] [green]Available:[/green] [purple]{', '.join(available_audio_languages)}[/purple] | "
+                f"[cyan bold]Audio    [/cyan bold] [green]Available:[/green] [purple]{', '.join(available_audio_languages)}[/purple] | "
                 f"[red]Set:[/red] [purple]{', '.join(DOWNLOAD_SPECIFIC_AUDIO)}[/purple] | "
                 f"[yellow]Downloadable:[/yellow] [purple]{', '.join(downloadable_audio_languages)}[/purple]"
             )
@@ -432,7 +429,8 @@ class HLS_Downloader:
                     'path': self.path_manager.output_path,
                     'url': self.m3u8_url,
                     'is_master': False,
-                    'error': 'File already exists',
+                    'msg': 'File already exists',
+                    'error': None,
                     'stopped': False
                 }
                 if TELEGRAM_BOT:
@@ -476,6 +474,8 @@ class HLS_Downloader:
                 'path': self.path_manager.output_path,
                 'url': self.m3u8_url,
                 'is_master': self.m3u8_manager.is_master,
+                'msg': None,
+                'error': None,
                 'stopped': download_stopped
             }
 
@@ -488,6 +488,7 @@ class HLS_Downloader:
                 'path': None,
                 'url': self.m3u8_url,
                 'is_master': getattr(self.m3u8_manager, 'is_master', None),
+                'msg': None,
                 'error': error_msg,
                 'stopped': False
             }

StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -17,14 +17,13 @@ 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, random_headers
-from StreamingCommunity.Util._jsonConfig import config_manager
-from StreamingCommunity.Util.os import os_manager
+from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.config_json import config_manager, get_use_large_bar
 
 
 # Logic class
@@ -34,16 +33,11 @@ from ...M3U8 import (
     M3U8_Parser,
     M3U8_UrlFix
 )
-from .proxyes import main_test_proxy
 
 # Config
 TQDM_DELAY_WORKER = config_manager.get_float('M3U8_DOWNLOAD', 'tqdm_delay')
-USE_LARGE_BAR = not ("android" in sys.platform or "ios" in sys.platform)
 REQUEST_MAX_RETRY = config_manager.get_int('REQUESTS', 'max_retry')
-REQUEST_VERIFY = False
-THERE_IS_PROXY_LIST = os_manager.check_file("list_proxy.txt")
-PROXY_START_MIN = config_manager.get_float('REQUESTS', 'proxy_start_min')
-PROXY_START_MAX = config_manager.get_float('REQUESTS', 'proxy_start_max')
+REQUEST_VERIFY = config_manager.get_int('REQUESTS', 'verify')
 DEFAULT_VIDEO_WORKERS = config_manager.get_int('M3U8_DOWNLOAD', 'default_video_workser')
 DEFAULT_AUDIO_WORKERS = config_manager.get_int('M3U8_DOWNLOAD', 'default_audio_workser')
 MAX_TIMEOOUT = config_manager.get_int("REQUESTS", "timeout")
@@ -52,6 +46,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):
@@ -133,15 +130,6 @@ class M3U8_Segments:
         ]
         self.class_ts_estimator.total_segments = len(self.segments)
 
-        # Proxy
-        if THERE_IS_PROXY_LIST:
-            console.log("[red]Start validation proxy.")
-            self.valid_proxy = main_test_proxy(self.segments[0])
-            console.log(f"[cyan]N. Valid ip: [red]{len(self.valid_proxy)}")
-
-            if len(self.valid_proxy) == 0:
-                sys.exit(0)
-
     def get_info(self) -> None:
         if self.is_index_url:
             try:
@@ -184,18 +172,13 @@ class M3U8_Segments:
         else:
             print("Signal handler must be set in the main thread")
 
-    def _get_http_client(self, index: int = None):
+    def _get_http_client(self):
         client_params = {
-            #'headers': random_headers(self.key_base_url) if hasattr(self, 'key_base_url') else {'User-Agent': get_userAgent()},
             'headers': {'User-Agent': get_userAgent()},
             'timeout': SEGMENT_MAX_TIMEOUT,
             'follow_redirects': True,
             'http2': False
         }
-        
-        if THERE_IS_PROXY_LIST and index is not None and hasattr(self, 'valid_proxy'):
-            client_params['proxies'] = self.valid_proxy[index % len(self.valid_proxy)]
-        
         return httpx.Client(**client_params)
                             
     def download_segment(self, ts_url: str, index: int, progress_bar: tqdm, backoff_factor: float = 1.1) -> None:
@@ -213,7 +196,7 @@ class M3U8_Segments:
                 return
             
             try:
-                with self._get_http_client(index) as client:
+                with self._get_http_client() as client:
                     start_time = time.time()
                     response = client.get(ts_url)
         
@@ -350,7 +333,6 @@ class M3U8_Segments:
 
             # Configure workers and delay
             max_workers = self._get_worker_count(type)
-            delay = max(PROXY_START_MIN, min(PROXY_START_MAX, 1 / (len(self.valid_proxy) + 1))) if THERE_IS_PROXY_LIST else TQDM_DELAY_WORKER
             
             # Download segments with completion verification
             with ThreadPoolExecutor(max_workers=max_workers) as executor:
@@ -361,7 +343,7 @@ class M3U8_Segments:
                     if self.interrupt_flag.is_set():
                         break
 
-                    time.sleep(delay)
+                    time.sleep(TQDM_DELAY_WORKER)
                     futures.append(executor.submit(self.download_segment, segment_url, index, progress_bar))
 
                 # Wait for futures with interrupt handling
@@ -405,7 +387,7 @@ class M3U8_Segments:
         """
         Generate platform-appropriate progress bar format.
         """
-        if not USE_LARGE_BAR:
+        if not get_use_large_bar():
             return (
                 f"{Colors.YELLOW}Proc{Colors.WHITE}: "
                 f"{Colors.RED}{{percentage:.2f}}% "
@@ -429,8 +411,6 @@ class M3U8_Segments:
             'audio': DEFAULT_AUDIO_WORKERS
         }.get(stream_type.lower(), 1)
 
-        if THERE_IS_PROXY_LIST:
-            return min(len(self.valid_proxy), base_workers * 2)
         return base_workers
     
     def _generate_results(self, stream_type: str) -> Dict:

StreamingCommunity/Lib/Downloader/MP4/downloader.py

@@ -12,13 +12,15 @@ 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.config_json import config_manager
 from StreamingCommunity.Util.os import internet_manager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -27,18 +29,17 @@ from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 from ...FFmpeg import print_duration_table
 
 
-# Suppress SSL warnings
-import urllib3
-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-
-
 # Config
+REQUEST_VERIFY = config_manager.get_int('REQUESTS', 'verify')
 GET_ONLY_LINK = config_manager.get_bool('M3U8_PARSER', 'get_only_link')
 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):
@@ -47,6 +48,7 @@ class InterruptHandler:
         self.kill_download = False
         self.force_quit = False
 
+
 def signal_handler(signum, frame, interrupt_handler, original_handler):
     """Enhanced signal handler for multiple interrupt scenarios"""
     current_time = time.time()
@@ -67,6 +69,7 @@ def signal_handler(signum, frame, interrupt_handler, original_handler):
         console.print("\n[bold red]Force quit activated. Saving partial download...[/bold red]")
         signal.signal(signum, original_handler)
 
+
 def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = None):
     """
     Downloads an MP4 video with enhanced interrupt handling.
@@ -111,7 +114,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     original_handler = signal.signal(signal.SIGINT, partial(signal_handler, interrupt_handler=interrupt_handler, original_handler=signal.getsignal(signal.SIGINT)))
 
     try:
-        transport = httpx.HTTPTransport(verify=False, http2=True)
+        transport = httpx.HTTPTransport(verify=REQUEST_VERIFY, http2=True)
         
         with httpx.Client(transport=transport, timeout=httpx.Timeout(60)) as client:
             with client.stream("GET", url, headers=headers, timeout=REQUEST_TIMEOUT) as response: