StreamingCommunity 2.6.1__py3-none-any.whl → 2.8.0__py3-none-any.whl

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -1,14 +1,16 @@
 # 10.12.23
 
+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_headers
+from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -19,12 +21,11 @@ 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")
-disable_searchDomain = config_manager.get_bool("DEFAULT", "disable_searchDomain")
 
 
 def title_search(title_search: str) -> int:
@@ -37,23 +38,24 @@ def title_search(title_search: str) -> int:
     Returns:
         int: The number of titles found.
     """
-    domain_to_use = site_constant
+    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
 
-    if not disable_searchDomain:
-        domain_to_use, base_url = search_domain(site_constant.SITE_NAME, f"https://{site_constant.SITE_NAME}.{site_constant.DOMAIN_NOW}")
+    if domain_to_use is None or base_url is None:
+        console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")
+        console.print("[yellow]The service might be temporarily unavailable or the domain may have changed.[/yellow]")
+        sys.exit(1)
 
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
 
     media_search_manager.clear()
     table_show_manager.clear()
-    
+
+    search_url = f"{site_constant.FULL_URL}/api/search?q={title_search}"
+    console.print(f"[cyan]Search url: [yellow]{search_url}")
+
     try:
-        response = httpx.get(
-            url=f"https://{site_constant.SITE_NAME}.{domain_to_use}/api/search?q={title_search.replace(' ', '+')}", 
-            headers={'user-agent': get_headers()}, 
-            timeout=max_timeout
-        )
+        response = httpx.get(search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
         response.raise_for_status()
 
     except Exception as e:

StreamingCommunity/Api/Site/streamingcommunity/util/ScrapeSerie.py

@@ -10,8 +10,8 @@ from bs4 import BeautifulSoup
 
 
 # Internal utilities
-from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import Season, EpisodeManager
 
 
@@ -19,18 +19,17 @@ from StreamingCommunity.Api.Player.Helper.Vixcloud.util import Season, EpisodeMa
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
-class ScrapeSerie:
-    def __init__(self, site_name: str):
+class GetSerieInfo:
+    def __init__(self, url):
         """
         Initialize the ScrapeSerie class for scraping TV series information.
         
         Args:
-            site_name (str): Name of the streaming site to scrape from
+            - url (str): The URL of the streaming site.
         """
         self.is_series = False
-        self.headers = {'user-agent': get_headers()}
-        self.base_name = site_name
-        self.domain = config_manager.get_dict('SITE', self.base_name)['domain']
+        self.headers = {'user-agent': get_userAgent()}
+        self.url = url
 
     def setup(self, media_id: int = None, series_name: str = None):
         """
@@ -58,7 +57,7 @@ class ScrapeSerie:
         """
         try:
             response = httpx.get(
-                url=f"https://{self.base_name}.{self.domain}/titles/{self.media_id}-{self.series_name}",
+                url=f"{self.url}/titles/{self.media_id}-{self.series_name}",
                 headers=self.headers,
                 timeout=max_timeout
             )
@@ -88,9 +87,9 @@ class ScrapeSerie:
         """
         try:
             response = httpx.get(
-                url=f'https://{self.base_name}.{self.domain}/titles/{self.media_id}-{self.series_name}/stagione-{number_season}', 
+                url=f'{self.url}/titles/{self.media_id}-{self.series_name}/stagione-{number_season}', 
                 headers={
-                    'User-Agent': get_headers(),
+                    'User-Agent': get_userAgent(),
                     'x-inertia': 'true', 
                     'x-inertia-version': self.version,
                 },

StreamingCommunity/Api/Template/Util/__init__.py

@@ -1,6 +1,5 @@
 # 23.11.24
 
-from .recall_search import execute_search
 from .get_domain import search_domain
 from .manage_ep import (
     manage_selection, 

StreamingCommunity/Api/Template/Util/get_domain.py

@@ -1,35 +1,23 @@
 # 18.06.24
 
-import ssl
-import time
+import certifi
 from urllib.parse import urlparse, unquote
 
 
 # External libraries
 import httpx
-from googlesearch import search
+from rich.console import Console
 
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.console import console, msg
-from StreamingCommunity.Util._jsonConfig import config_manager
-
-base_headers = {
-    'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
-    'accept-language': 'it-IT,it;q=0.9,en-US;q=0.8,en;q=0.7',
-    'dnt': '1',
-    'priority': 'u=0, i',
-    'referer': '',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"Windows"',
-    'sec-fetch-dest': 'document',
-    'sec-fetch-mode': 'navigate',
-    'sec-fetch-site': 'same-origin',
-    'sec-fetch-user': '?1',
-    'upgrade-insecure-requests': '1',
-    'user-agent': ''
-}
+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):
@@ -58,24 +46,15 @@ def get_base_domain(url_str):
 
         # Check if domain has multiple parts separated by dots
         parts = domain.split('.')
-        if len(parts) > 2:  # Handle subdomains
-            return '.'.join(parts[:-1])  # Return everything except TLD
+        if len(parts) > 2:
+            return '.'.join(parts[:-1])
         
-        return parts[0]  # Return base domain
+        return parts[0]
     
     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}")
     
@@ -83,120 +62,38 @@ def validate_url(url, base_url, max_timeout, max_retries=2, sleep=1):
     base_domain = get_base_domain(base_url)
     url_domain = get_base_domain(url)
 
-    base_headers['referer'] = url
-    base_headers['user-agent'] = get_headers()
-    
     if base_domain != url_domain:
         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:  # Allow for one extra dot for TLD change
-        console.print(f"[red]Too many subdomains in URL")
-        return False, None
-
     client = httpx.Client(
-        verify=False,
-        headers=base_headers,
-        timeout=max_timeout
+        verify=VERIFY,
+        headers=get_headers(),
+        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")
-    domain = str(config_manager.get_dict("SITE", site_name)['domain'])
-    
-    # Test initial URL
+    """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.config['SITE'][site_name]['domain'] = tld
-            config_manager.write_config()
-            console.print(f"[green]Successfully validated initial URL")
             return tld, base_url
         
-    except Exception as e:
-        console.print(f"[red]Error testing initial URL: {str(e)}")
-
-    # Google search phase
-    base_domain = get_base_domain(base_url)
-    console.print(f"\n[cyan]Searching for alternate domains for[white]: [yellow]{base_domain}")
-    
-    try:
-        search_results = list(search(base_domain, num_results=20, lang="it"))
-
-        base_urls = set()
-        for url in search_results:
-            element_url = get_base_url(url)
-            if element_url:
-                base_urls.add(element_url)
+        else:
+            return None, None
         
-        # Filter URLs based on domain matching and subdomain count
-        filtered_results = [
-            url for url in base_urls 
-            if get_base_domain(url) == base_domain 
-            and url.count('.') <= base_url.count('.') + 1
-        ]
-
-        for idx, result_url in enumerate(filtered_results, 1):
-            console.print(f"\n[cyan]Checking result {idx}/{len(filtered_results)}[white]: [yellow]{result_url}")
-            
-            is_valid, new_tld = validate_url(result_url, base_url, max_timeout)
-            if is_valid:
-                final_tld = new_tld or get_tld(result_url)
-
-                if get_first or msg.ask(
-                    f"\n[cyan]Update site[white] [red]'{site_name}'[cyan] with domain[white] [red]'{final_tld}'",
-                    choices=["y", "n"],
-                    default="y"
-                ).lower() == "y":
-                    
-                    config_manager.config['SITE'][site_name]['domain'] = final_tld
-                    config_manager.write_config()
-                    return final_tld, f"{base_url}.{final_tld}"
-                    
     except Exception as e:
-        console.print(f"[red]Error during search: {str(e)}")
-
-    console.print("[bold red]No valid URLs found matching the base URL.")
-    return domain, f"{base_url}.{domain}"
+        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,37 +29,41 @@ 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):
-        return config_manager.get_dict('SITE', self.SITE_NAME)['domain']
+        return config_manager.get_site(self.SITE_NAME, 'domain')
+    
+    @property
+    def FULL_URL(self):
+        return config_manager.get_site(self.SITE_NAME, 'full_url').rstrip('/')
     
     @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):
         try:
-            return config_manager.get_dict('SITE', self.SITE_NAME)['extra']
+            return config_manager.get_dict('SITE_EXTRA', self.SITE_NAME)
         except KeyError:
             return None
     

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.headers import get_headers
-from StreamingCommunity.Util.console import console, Panel
-from StreamingCommunity.Util.os import (
-    compute_sha1_hash,
-    os_manager,
-    internet_manager
-)
+from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.os import compute_sha1_hash, os_manager, internet_manager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
 
@@ -47,15 +44,15 @@ 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:
     """Client for making HTTP requests to HLS endpoints with retry mechanism."""
     def __init__(self):
-        self.headers = {'User-Agent': get_headers()}
+        self.headers = {'User-Agent': get_userAgent()}
 
     def request(self, url: str, return_content: bool = False) -> Optional[httpx.Response]:
         """
@@ -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]"
             )