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

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]:
     """

StreamingCommunity/Api/Site/ddlstreamitaly/site.py

@@ -7,11 +7,11 @@ 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.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
 
@@ -23,10 +23,10 @@ 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(word_to_search: str) -> int:
@@ -42,24 +42,19 @@ def title_search(word_to_search: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Find new domain if prev dont work
-    domain_to_use = site_constant.DOMAIN_NOW
-    
-    if not disable_searchDomain:
-        domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    # Check if domain is working
+    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
 
     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("[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)
 
-    # Send request to search for titles
+    search_url = f"{site_constant.FULL_URL}/search/?&q={word_to_search}&quick=1&type=videobox_video&nodes=11"
+    console.print(f"[cyan]Search url: [yellow]{search_url}")
+
     try:
-        response = httpx.get(
-            url=f"{site_constant.FULL_URL}/search/?&q={word_to_search}&quick=1&type=videobox_video&nodes=11", 
-            headers={'user-agent': get_userAgent()},
-            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/ddlstreamitaly/util/ScrapeSerie.py

@@ -11,7 +11,7 @@ from bs4 import BeautifulSoup
 
 
 # Internal utilities
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
 
 

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):
     """

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]:
     """

StreamingCommunity/Api/Site/guardaserie/site.py

@@ -2,14 +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.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
 
@@ -21,10 +21,11 @@ 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(word_to_search: str) -> int:
@@ -40,25 +41,19 @@ def title_search(word_to_search: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Find new domain if prev dont work
-    domain_to_use = site_constant.DOMAIN_NOW
-
-    if not disable_searchDomain:
-        domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    # Check if domain is working
+    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
 
     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("[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)
 
-    # Send request to search for titles
-    print(f"{site_constant.FULL_URL}/?story={word_to_search}&do=search&subaction=search")
+    search_url = f"{site_constant.FULL_URL}/?story={word_to_search}&do=search&subaction=search"
+    console.print(f"[cyan]Search url: [yellow]{search_url}")
+
     try:
-        response = httpx.get(
-            url=f"{site_constant.FULL_URL}/?story={word_to_search}&do=search&subaction=search", 
-            headers={'user-agent': get_userAgent()}, 
-            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/guardaserie/util/ScrapeSerie.py

@@ -11,7 +11,7 @@ from bs4 import BeautifulSoup
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 
 
 # Logic class

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):
     """

StreamingCommunity/Api/Site/mostraguarda/film.py

@@ -7,14 +7,14 @@ 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.os import os_manager, get_call_stack
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.table import TVShowManager, get_call_stack
+from StreamingCommunity.Util.table import TVShowManager
 from StreamingCommunity.Lib.Downloader import HLS_Downloader
 
 
@@ -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.

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):
     """
@@ -38,7 +45,7 @@ def search(string_to_search: str = None, get_onylDatabase: bool = False):
             # Chiedi la scelta all'utente con il bot Telegram
             string_to_search = bot.ask(
                 "key_search",
-                f"Inserisci la parola da cercare\noppure 🔙 back per tornare alla scelta: ",
+                f"Inserisci la parola da cercare\noppure back per tornare alla scelta: ",
                 None
             )
 

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.

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -4,14 +4,18 @@ 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
 from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
 
 # Logic class
-from .util.ScrapeSerie import ScrapeSerie
+from .util.ScrapeSerie import GetSerieInfo
 from StreamingCommunity.Api.Template.Util import (
     manage_selection, 
     map_episode_title, 
@@ -28,7 +32,12 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 
-def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: ScrapeSerie, video_source: VideoSource) -> Tuple[str,bool]:
+# Variable
+msg = Prompt()
+console = Console()
+
+
+def download_video(index_season_selected: int, index_episode_selected: int, scrape_serie: GetSerieInfo, video_source: VideoSource) -> Tuple[str,bool]:
     """
     Download a single episode video.
 
@@ -85,7 +94,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     return r_proc['path'], r_proc['stopped']
 
-def download_episode(index_season_selected: int, scrape_serie: ScrapeSerie, video_source: VideoSource, download_all: bool = False) -> None:
+def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, video_source: VideoSource, download_all: bool = False) -> None:
     """
     Download episodes of a selected season.
 
@@ -147,7 +156,7 @@ def download_series(select_season: MediaItem) -> None:
     start_message()
 
     # Init class
-    scrape_serie = ScrapeSerie(site_constant.FULL_URL)
+    scrape_serie = GetSerieInfo(site_constant.FULL_URL)
     video_source = VideoSource(site_constant.FULL_URL, True)
 
     # Setup video source

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -5,11 +5,11 @@ 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.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
@@ -21,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:
@@ -39,13 +38,10 @@ def title_search(title_search: str) -> int:
     Returns:
         int: The number of titles found.
     """
-    domain_to_use = site_constant
-
-    if not disable_searchDomain:
-        domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
 
     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("[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)
 
@@ -54,13 +50,12 @@ def title_search(title_search: str) -> int:
 
     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"{site_constant.FULL_URL}/api/search?q={title_search.replace(' ', '+')}", 
-            headers={'user-agent': get_userAgent()}, 
-            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

@@ -11,7 +11,7 @@ from bs4 import BeautifulSoup
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import Season, EpisodeManager
 
 
@@ -19,7 +19,7 @@ from StreamingCommunity.Api.Player.Helper.Vixcloud.util import Season, EpisodeMa
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
-class ScrapeSerie:
+class GetSerieInfo:
     def __init__(self, url):
         """
         Initialize the ScrapeSerie class for scraping TV series information.

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,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 = {