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

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -48,7 +48,7 @@ def download_film(select_title: MediaItem) -> str:
     console.print(f"[yellow]Download: [red]{select_title.name} \n")
 
     # Init class
-    video_source = VideoSource(site_constant.SITE_NAME, False)
+    video_source = VideoSource(site_constant.FULL_URL, False)
     video_source.setup(select_title.id)
 
     # Retrieve scws and if available master playlist

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -132,14 +132,13 @@ def download_episode(index_season_selected: int, scrape_serie: ScrapeSerie, vide
             if stopped:
                 break
 
-def download_series(select_season: MediaItem, version: str) -> None:
+def download_series(select_season: MediaItem) -> None:
     """
     Download episodes of a TV series based on user selection.
 
     Parameters:
         - select_season (MediaItem): Selected media item (TV series).
         - domain (str): Domain from which to download.
-        - version (str): Version of the site.
     """
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
@@ -148,11 +147,11 @@ def download_series(select_season: MediaItem, version: str) -> None:
     start_message()
 
     # Init class
-    scrape_serie = ScrapeSerie(site_constant.SITE_NAME)
-    video_source = VideoSource(site_constant.SITE_NAME, True)
+    scrape_serie = ScrapeSerie(site_constant.FULL_URL)
+    video_source = VideoSource(site_constant.FULL_URL, True)
 
     # Setup video source
-    scrape_serie.setup(version, select_season.id, select_season.slug)
+    scrape_serie.setup(select_season.id, select_season.slug)
     video_source.setup(select_season.id)
 
     # Collect information about seasons
@@ -194,11 +193,11 @@ def download_series(select_season: MediaItem, version: str) -> None:
         if len(list_season_select) > 1 or index_season_selected == "*":
 
             # Download all episodes if multiple seasons are selected or if '*' is used
-            download_episode(i_season, scrape_serie, video_source, download_all=True)
+            download_episode(scrape_serie.season_manager.seasonsData.get_season_by_number(i_season-1).number, scrape_serie, video_source, download_all=True)
         else:
 
             # Otherwise, let the user select specific episodes for the single season
-            download_episode(i_season, scrape_serie, video_source, download_all=False)
+            download_episode(scrape_serie.season_manager.seasonsData.get_season_by_number(i_season-1).number, scrape_serie, video_source, download_all=False)
 
     if site_constant.TELEGRAM_BOT:
         bot.send_message(f"Finito di scaricare tutte le serie e episodi", None)

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -1,19 +1,16 @@
 # 10.12.23
 
-import json
-import logging
-import secrets
+import sys
 
 
 # External libraries
 import httpx
-from bs4 import BeautifulSoup
 
 
 # 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.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -32,72 +29,26 @@ max_timeout = config_manager.get_int("REQUESTS", "timeout")
 disable_searchDomain = config_manager.get_bool("DEFAULT", "disable_searchDomain")
 
 
-def get_version(domain: str):
+def title_search(title_search: str) -> int:
     """
-    Extracts the version from the HTML text of a webpage.
-
+    Search for titles based on a search query.
+      
     Parameters:
-        - domain (str): The domain of the site.
+        - title_search (str): The title to search for.
 
     Returns:
-        str: The version extracted from the webpage.
-    """
-    try:
-        response = httpx.get(
-            url=f"https://{site_constant.SITE_NAME}.{domain}/", 
-            headers={'User-Agent': get_headers()}, 
-            timeout=max_timeout
-        )
-        response.raise_for_status()
-
-        # Parse request to site
-        soup = BeautifulSoup(response.text, "html.parser")
-
-        # Extract version
-        version = json.loads(soup.find("div", {"id": "app"}).get("data-page"))['version']
-        #console.print(f"[cyan]Get version [white]=> [red]{version} \n")
-
-        return version
-    
-    except Exception as e:
-        logging.error(f"Error extracting version: {e}")
-        raise
-
-
-def get_version_and_domain():
-    """
-    Retrieve the current version and domain of the site.
-
-    This function performs the following steps:
-        - Determines the correct domain to use for the site by searching for a specific meta tag.
-        - Fetches the content of the site to extract the version information.
+        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, f"https://{site_constant.SITE_NAME}.{site_constant.DOMAIN_NOW}")
-
-    try:
-        version = get_version(domain_to_use)
-    except:
-        #console.print("[green]Auto generate version ...")
-        #version = secrets.token_hex(32 // 2)
-        version = None
-            
-    return version, domain_to_use
-
+        domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
 
-def title_search(title_search: str, domain: str) -> int:
-    """
-    Search for titles based on a search query.
-      
-    Parameters:
-        - title_search (str): The title to search for.
-        - domain (str): The domain to search on.
+    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)
 
-    Returns:
-        int: The number of titles found.
-    """
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
 
@@ -106,8 +57,8 @@ def title_search(title_search: str, domain: str) -> int:
     
     try:
         response = httpx.get(
-            url=f"https://{site_constant.SITE_NAME}.{domain}/api/search?q={title_search.replace(' ', '+')}", 
-            headers={'user-agent': get_headers()}, 
+            url=f"{site_constant.FULL_URL}/api/search?q={title_search.replace(' ', '+')}", 
+            headers={'user-agent': get_userAgent()}, 
             timeout=max_timeout
         )
         response.raise_for_status()

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

@@ -10,7 +10,7 @@ from bs4 import BeautifulSoup
 
 
 # Internal utilities
-from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util._jsonConfig import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import Season, EpisodeManager
 
@@ -20,28 +20,25 @@ max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 class ScrapeSerie:
-    def __init__(self, site_name: str):
+    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, version: str = None, media_id: int = None, series_name: str = None):
+    def setup(self, media_id: int = None, series_name: str = None):
         """
         Set up the scraper with specific media details.
         
         Args:
-            version (str, optional): Site version for request headers
             media_id (int, optional): Unique identifier for the media
             series_name (str, optional): Name of the TV series
         """
-        self.version = version
         self.media_id = media_id
 
         # If series name is provided, initialize series-specific managers
@@ -60,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
             )
@@ -70,18 +67,6 @@ class ScrapeSerie:
             soup = BeautifulSoup(response.text, "html.parser")
             json_response = json.loads(soup.find("div", {"id": "app"}).get("data-page"))
             self.version = json_response['version']
-                  
-            """
-            response = httpx.post(
-                url=f'https://{self.base_name}.{self.domain}/api/titles/preview/{self.media_id}', 
-                headers={'User-Agent': get_headers()}
-            )
-            response.raise_for_status()
-            
-
-            # Extract seasons from JSON response
-            json_response = response.json()
-            """
 
             # Collect info about season
             self.season_manager = Season(json_response.get("props").get("title"))
@@ -102,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/get_domain.py

@@ -7,29 +7,13 @@ from urllib.parse import urlparse, unquote
 
 # External libraries
 import httpx
-from googlesearch import search
 
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.console import console, msg
+from StreamingCommunity.Util.console import console
 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': ''
-}
 
 
 def get_tld(url_str):
@@ -58,10 +42,10 @@ 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
@@ -83,9 +67,6 @@ 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
@@ -93,13 +74,13 @@ def validate_url(url, base_url, max_timeout, max_retries=2, sleep=1):
     # 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
+    if url_dots > base_dots + 1:
         console.print(f"[red]Too many subdomains in URL")
         return False, None
 
     client = httpx.Client(
         verify=False,
-        headers=base_headers,
+        headers=get_headers(),
         timeout=max_timeout
     )
 
@@ -142,61 +123,19 @@ def validate_url(url, base_url, max_timeout, max_retries=2, sleep=1):
 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
     try:
         is_correct, redirect_tld = validate_url(base_url, base_url, max_timeout)
 
         if is_correct:
             tld = redirect_tld or get_tld(base_url)
-            config_manager.config['SITE'][site_name]['domain'] = tld
-            config_manager.write_config()
+            config_manager.configSite[site_name]['domain'] = tld
+
             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)}")

StreamingCommunity/Api/Template/Util/manage_ep.py

@@ -6,7 +6,7 @@ from typing import List
 
 
 # Internal utilities
-from StreamingCommunity.Util.console import console
+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
@@ -47,28 +47,33 @@ def manage_selection(cmd_insert: str, max_count: int) -> List[int]:
     Returns:
         list_selection (List[int]): List of selected items.
     """
-    list_selection = []
-    logging.info(f"Command insert: {cmd_insert}, end index: {max_count + 1}")
-
-    # For a single number (e.g., '5')
-    if cmd_insert.isnumeric():
-        list_selection.append(int(cmd_insert))
-
-    # For a range (e.g., '5-12')
-    elif "-" in cmd_insert:
-        start, end = map(str.strip, cmd_insert.split('-'))
-        start = int(start)
-        end = int(end) if end.isnumeric() else max_count
-
-        list_selection = list(range(start, end + 1))
-        
-    # For all items ('*')
-    elif cmd_insert == "*":
-        list_selection = list(range(1, max_count + 1))
-
-    else:
-        raise ValueError("Invalid input format")
-
+    while True:
+        list_selection = []
+        logging.info(f"Command insert: {cmd_insert}, end index: {max_count + 1}")
+
+        # For a single number (e.g., '5')
+        if cmd_insert.isnumeric():
+            list_selection.append(int(cmd_insert))
+            break
+
+        # For a range (e.g., '5-12')
+        elif "-" in cmd_insert:
+            try:
+                start, end = map(str.strip, cmd_insert.split('-'))
+                start = int(start)
+                end = int(end) if end.isnumeric() else max_count
+                list_selection = list(range(start, end + 1))
+                break
+            except ValueError:
+                pass
+
+        # For all items ('*')
+        elif cmd_insert == "*":
+            list_selection = list(range(1, max_count + 1))
+            break
+
+        cmd_insert = msg.ask("[red]Invalid input. Please enter a valid command: ")
+    
     logging.info(f"List return: {list_selection}")
     return list_selection
 

StreamingCommunity/Api/Template/config_loader.py

@@ -33,7 +33,11 @@ class SiteConstant:
     
     @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):
@@ -59,7 +63,7 @@ class SiteConstant:
     @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/Lib/Downloader/HLS/downloader.py

@@ -14,7 +14,7 @@ import httpx
 
 # Internal utilities
 from StreamingCommunity.Util._jsonConfig import config_manager
-from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.console import console, Panel
 from StreamingCommunity.Util.os import (
     compute_sha1_hash,
@@ -55,7 +55,7 @@ TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
 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]:
         """

StreamingCommunity/Lib/Downloader/HLS/proxyes.py

@@ -12,7 +12,7 @@ import httpx
 
 # Internal utilities
 from StreamingCommunity.Util._jsonConfig import config_manager
-from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.os import os_manager
 
 
@@ -46,7 +46,7 @@ class ProxyManager:
 
         try:
             with httpx.Client(proxies=proxy, verify=False) as client:
-                response = client.get(self.url, timeout=self.timeout, headers={'user-agent': get_headers()})
+                response = client.get(self.url, timeout=self.timeout, headers={'user-agent': get_userAgent()})
 
                 if response.status_code == 200:
                     logging.info(f"Proxy {proxy} is working.")

StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -22,7 +22,7 @@ from tqdm import tqdm
 # Internal utilities
 from StreamingCommunity.Util.color import Colors
 from StreamingCommunity.Util.console import console
-from StreamingCommunity.Util.headers import get_headers, random_headers
+from StreamingCommunity.Util.headers import get_userAgent, random_headers
 from StreamingCommunity.Util._jsonConfig import config_manager
 from StreamingCommunity.Util.os import os_manager
 
@@ -102,7 +102,7 @@ class M3U8_Segments:
         self.key_base_url = f"{parsed_url.scheme}://{parsed_url.netloc}/"
         
         try:
-            client_params = {'headers': {'User-Agent': get_headers()}, 'timeout': MAX_TIMEOOUT}
+            client_params = {'headers': {'User-Agent': get_userAgent()}, 'timeout': MAX_TIMEOOUT}
             response = httpx.get(url=key_uri, **client_params)
             response.raise_for_status()
 
@@ -145,7 +145,7 @@ class M3U8_Segments:
     def get_info(self) -> None:
         if self.is_index_url:
             try:
-                client_params = {'headers': {'User-Agent': get_headers()}, 'timeout': MAX_TIMEOOUT}
+                client_params = {'headers': {'User-Agent': get_userAgent()}, 'timeout': MAX_TIMEOOUT}
                 response = httpx.get(self.url, **client_params)
                 response.raise_for_status()
                 
@@ -186,8 +186,8 @@ class M3U8_Segments:
 
     def _get_http_client(self, index: int = None):
         client_params = {
-            #'headers': random_headers(self.key_base_url) if hasattr(self, 'key_base_url') else {'User-Agent': get_headers()},
-            'headers': {'User-Agent': get_headers()},
+            #'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

StreamingCommunity/Lib/Downloader/MP4/downloader.py

@@ -15,7 +15,7 @@ from tqdm import tqdm
 
 
 # Internal utilities
-from StreamingCommunity.Util.headers import get_headers
+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
@@ -99,7 +99,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
         if headers_:
             headers.update(headers_)
         else:
-            headers['User-Agent'] = get_headers()
+            headers['User-Agent'] = get_userAgent()
 
     except Exception as header_err:
         logging.error(f"Error preparing headers: {header_err}")

StreamingCommunity/Upload/update.py

@@ -13,7 +13,7 @@ import httpx
 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_headers
+from StreamingCommunity.Util.headers import get_userAgent
 
 
 
@@ -31,14 +31,14 @@ def update():
     try:
         response_reposity = httpx.get(
             url=f"https://api.github.com/repos/{__author__}/{__title__}", 
-            headers={'user-agent': get_headers()}, 
+            headers={'user-agent': get_userAgent()}, 
             timeout=config_manager.get_int("REQUESTS", "timeout"), 
             follow_redirects=True
         ).json()
 
         response_releases = httpx.get(
             url=f"https://api.github.com/repos/{__author__}/{__title__}/releases",
-            headers={'user-agent': get_headers()}, 
+            headers={'user-agent': get_userAgent()}, 
             timeout=config_manager.get_int("REQUESTS", "timeout"), 
             follow_redirects=True
         ).json()

StreamingCommunity/Upload/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = '2.6.0'
+__version__ = '2.7.0'
 __author__ = 'Arrowar'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2024'