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

StreamingCommunity/Util/_jsonConfig.py

@@ -4,97 +4,230 @@ import os
 import sys
 import json
 import logging
-from pathlib import Path
+import requests
 from typing import Any, List
 
 
+# External library
+from rich.console import Console
+
+
+# Variable
+console = Console()
+
+
 class ConfigManager:
     def __init__(self, file_name: str = 'config.json') -> None:
         """Initialize the ConfigManager.
 
         Parameters:
-            - file_path (str, optional): The path to the configuration file. Default is 'config.json'.
+            - file_name (str, optional): The name of the configuration file. Default is 'config.json'.
         """
-        self.file_path = Path(__file__).parent.parent.parent / file_name
+        if getattr(sys, 'frozen', False):
+            base_path = os.path.join(".")
+        else:
+            base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+            
+        self.file_path = os.path.join(base_path, file_name)
+        self.domains_path = os.path.join(base_path, 'domains.json')
         self.config = {}
+        self.configSite = {}
         self.cache = {}
+        self.reference_config_url = 'https://raw.githubusercontent.com/Arrowar/StreamingCommunity/refs/heads/main/config.json'
+        
+        # Validate and update config before proceeding
+        self._validate_and_update_config()
+        self._read_initial_config()
+        
+        console.print(f"[bold cyan]📂 Configuration file path:[/bold cyan] [green]{self.file_path}[/green]")
+
+    def _validate_and_update_config(self) -> None:
+        """Validate local config against reference config and update missing keys."""
+        try:
+            # Load local config if exists
+            local_config = {}
+            if os.path.exists(self.file_path):
+                with open(self.file_path, 'r') as f:
+                    local_config = json.load(f)
+                console.print("[bold cyan]📖 Local configuration found.[/bold cyan]")
+
+            # Download reference config
+            console.print("[bold cyan]🌍 Downloading reference configuration...[/bold cyan]")
+            response = requests.get(self.reference_config_url)
+            if response.status_code != 200:
+                raise Exception(f"Failed to download reference config. Status code: {response.status_code}")
+            reference_config = response.json()
+
+            # Compare and update missing keys
+            merged_config = self._deep_merge_configs(local_config, reference_config)
+            
+            if merged_config != local_config:
+                # Save the merged config
+                with open(self.file_path, 'w') as f:
+                    json.dump(merged_config, f, indent=4)
+                console.print("[bold green]✅ Configuration updated with missing keys.[/bold green]")
+            else:
+                console.print("[bold green]✅ Configuration is up to date.[/bold green]")
+
+            self.config = merged_config
+
+        except Exception as e:
+            console.print(f"[bold red]❌ Error validating configuration: {e}[/bold red]")
+            if not self.config:
+                # If validation failed and we have no config, download the reference config
+                self.download_requirements(self.reference_config_url, self.file_path)
+                with open(self.file_path, 'r') as f:
+                    self.config = json.load(f)
+
+    def _deep_merge_configs(self, local_config: dict, reference_config: dict) -> dict:
+        """
+        Recursively merge reference config into local config, preserving local values.
+        
+        Args:
+            local_config (dict): The local configuration
+            reference_config (dict): The reference configuration
+            
+        Returns:
+            dict: Merged configuration
+        """
+        merged = local_config.copy()
+        
+        for key, value in reference_config.items():
+            if key not in merged:
+                merged[key] = value
+            elif isinstance(value, dict) and isinstance(merged[key], dict):
+                merged[key] = self._deep_merge_configs(merged[key], value)
+                
+        return merged
+
+    def _read_initial_config(self) -> None:
+        """Read initial configuration to get use_api setting."""
+        try:
+            if os.path.exists(self.file_path):
+                with open(self.file_path, 'r') as f:
+                    self.config = json.load(f)
+                self.use_api = self.config.get('DEFAULT', {}).get('use_api', True)
+            else:
+                self.use_api = True  # Default to True if config file doesn't exist
+                console.print("[bold yellow]⚠️ Configuration file not found. Using default settings.[/bold yellow]")
+
+        except Exception as e:
+            self.use_api = True  # Default to True in case of error
+            logging.error(f"❌ Error reading initial configuration: {e}")
 
     def read_config(self) -> None:
         """Read the configuration file."""
         try:
-            logging.info(f"Reading file: {self.file_path}")
+            logging.info(f"📖 Reading file: {self.file_path}")
 
             # Check if file exists
             if os.path.exists(self.file_path):
                 with open(self.file_path, 'r') as f:
                     self.config = json.load(f)
-                logging.info("Configuration file loaded successfully.")
-
-            # Download config.json if it doesn't exist locally
+                console.print("[bold green]✅ Configuration file loaded successfully.[/bold green]")
             else:
-                logging.info("Configuration file does not exist. Downloading...")
-                self.download_requirements(
-                    'https://raw.githubusercontent.com/Arrowar/StreamingCommunity/refs/heads/main/config.json',
-                    self.file_path
-                )
+                console.print("[bold yellow]⚠️ Configuration file not found. Downloading...[/bold yellow]")
+                self.download_requirements(self.reference_config_url, self.file_path)
 
                 # Load the downloaded config.json into the config attribute
                 with open(self.file_path, 'r') as f:
                     self.config = json.load(f)
-                logging.info("Configuration file downloaded and saved.")
+                console.print("[bold green]✅ Configuration file downloaded and saved.[/bold green]")
 
-            logging.info("Configuration file processed successfully.")
+            # Update site configuration separately
+            self.update_site_config()
+
+            console.print("[bold cyan]🔧 Configuration file processing complete.[/bold cyan]")
 
         except Exception as e:
-            logging.error(f"Error reading configuration file: {e}")
+            logging.error(f"❌ Error reading configuration file: {e}")
 
-    def download_requirements(self, url: str, filename: str):
+    def download_requirements(self, url: str, filename: str) -> None:
         """
-        Download the requirements.txt file from the specified URL if not found locally using requests.
+        Download a file from the specified URL if not found locally using requests.
 
         Args:
-            url (str): The URL to download the requirements file from.
-            filename (str): The local filename to save the requirements file as.
+            url (str): The URL to download the file from.
+            filename (str): The local filename to save the file as.
         """
         try:
-            import requests
-
-            logging.info(f"{filename} not found locally. Downloading from {url}...")
+            logging.info(f"🌍 Downloading {filename} from {url}...")
             response = requests.get(url)
 
             if response.status_code == 200:
                 with open(filename, 'wb') as f:
                     f.write(response.content)
-
+                console.print(f"[bold green]✅ Successfully downloaded {filename}.[/bold green]")
+                
             else:
-                logging.error(f"Failed to download {filename}. HTTP Status code: {response.status_code}")
+                logging.error(f"❌ Failed to download {filename}. HTTP Status code: {response.status_code}")
                 sys.exit(0)
 
         except Exception as e:
-            logging.error(f"Failed to download {filename}: {e}")
+            logging.error(f"❌ Failed to download {filename}: {e}")
             sys.exit(0)
 
-    def read_key(self, section: str, key: str, data_type: type = str) -> Any:
-        """Read a key from the configuration file.
+    def update_site_config(self) -> None:
+        """Fetch and update the site configuration with data from the API or local file."""
+        if self.use_api:
+            headers = {
+                "apikey": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inp2Zm5ncG94d3Jnc3duenl0YWRoIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDAxNTIxNjMsImV4cCI6MjA1NTcyODE2M30.FNTCCMwi0QaKjOu8gtZsT5yQttUW8QiDDGXmzkn89QE",
+                "Authorization": f"Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inp2Zm5ncG94d3Jnc3duenl0YWRoIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDAxNTIxNjMsImV4cCI6MjA1NTcyODE2M30.FNTCCMwi0QaKjOu8gtZsT5yQttUW8QiDDGXmzkn89QE",
+                "Content-Type": "application/json"
+            }
+
+            try:
+                console.print("[bold cyan]🌍 Fetching SITE data from API...[/bold cyan]")
+                response = requests.get("https://zvfngpoxwrgswnzytadh.supabase.co/rest/v1/public", headers=headers)
+
+                if response.status_code == 200:
+                    self.configSite = response.json()[0]['data']
+                    console.print("[bold green]✅ SITE data successfully fetched.[/bold green]")
+                else:
+                    console.print(f"[bold red]❌ Failed to fetch SITE data. HTTP Status code: {response.status_code}[/bold red]")
+
+            except Exception as e:
+                console.print(f"[bold red]❌ Error fetching SITE data: {e}[/bold red]")
+        else:
+            try:
+                if os.path.exists(self.domains_path):
+                    console.print("[bold cyan]📖 Reading domains from local file...[/bold cyan]")
+                    with open(self.domains_path, 'r') as f:
+                        self.configSite = json.load(f)
+                    console.print("[bold green]✅ Domains loaded successfully from local file.[/bold green]")
+                else:
+                    error_msg = "❌ domains.json not found and API usage is disabled"
+                    console.print(f"[bold red]{error_msg}[/bold red]")
+                    raise FileNotFoundError(error_msg)
+
+            except Exception as e:
+                console.print(f"[bold red]❌ Error reading domains file: {e}[/bold red]")
+                raise
+
+    def read_key(self, section: str, key: str, data_type: type = str, from_site: bool = False) -> Any:
+        """Read a key from the configuration.
 
         Parameters:
-            - section (str): The section in the configuration file.
+            - section (str): The section in the configuration.
             - key (str): The key to be read.
             - data_type (type, optional): The expected data type of the key's value. Default is str.
+            - from_site (bool, optional): Whether to read from site config. Default is False.
 
         Returns:
             The value of the key converted to the specified data type.
         """
-        cache_key = f"{section}.{key}"
+        cache_key = f"{'site' if from_site else 'config'}.{section}.{key}"
         logging.info(f"Read key: {cache_key}")
 
         if cache_key in self.cache:
             return self.cache[cache_key]
 
-        if section in self.config and key in self.config[section]:
-            value = self.config[section][key]
+        config_source = self.configSite if from_site else self.config
+        
+        if section in config_source and key in config_source[section]:
+            value = config_source[section][key]
         else:
-            raise ValueError(f"Key '{key}' not found in section '{section}'")
+            raise ValueError(f"Key '{key}' not found in section '{section}' of {'site' if from_site else 'main'} config")
 
         value = self._convert_to_data_type(value, data_type)
         self.cache[cache_key] = value
@@ -122,100 +255,80 @@ class ConfigManager:
         else:
             return value
 
+    # Main config getters
     def get(self, section: str, key: str) -> Any:
-        """Read a value from the configuration file.
-
-        Parameters:
-            - section (str): The section in the configuration file.
-            - key (str): The key to be read.
-
-        Returns:
-            The value associated with the key.
-        """
+        """Read a value from the main configuration."""
         return self.read_key(section, key)
 
     def get_int(self, section: str, key: str) -> int:
-        """Read an integer value from the configuration file.
-
-        Parameters:
-            - section (str): The section in the configuration file.
-            - key (str): The key to be read.
-
-        Returns:
-            int: The integer value.
-        """
+        """Read an integer value from the main configuration."""
         return self.read_key(section, key, int)
 
-    def get_float(self, section: str, key: str) -> int:
-        """Read an float value from the configuration file.
-
-        Parameters:
-            - section (str): The section in the configuration file.
-            - key (str): The key to be read.
-
-        Returns:
-            float: The float value.
-        """
+    def get_float(self, section: str, key: str) -> float:
+        """Read a float value from the main configuration."""
         return self.read_key(section, key, float)
 
     def get_bool(self, section: str, key: str) -> bool:
-        """Read a boolean value from the configuration file.
-
-        Parameters:
-            - section (str): The section in the configuration file.
-            - key (str): The key to be read.
-
-        Returns:
-            bool: The boolean value.
-        """
+        """Read a boolean value from the main configuration."""
         return self.read_key(section, key, bool)
 
     def get_list(self, section: str, key: str) -> List[str]:
-        """Read a list value from the configuration file.
-
-        Parameters:
-            - section (str): The section in the configuration file.
-            - key (str): The key to be read.
-
-        Returns:
-            list: The list value.
-        """
+        """Read a list value from the main configuration."""
         return self.read_key(section, key, list)
 
     def get_dict(self, section: str, key: str) -> dict:
-        """Read a dictionary value from the configuration file.
+        """Read a dictionary value from the main configuration."""
+        return self.read_key(section, key, dict)
 
-        Parameters:
-            - section (str): The section in the configuration file.
-            - key (str): The key to be read.
+    # Site config getters
+    def get_site(self, section: str, key: str) -> Any:
+        """Read a value from the site configuration."""
+        return self.read_key(section, key, from_site=True)
 
-        Returns:
-            dict: The dictionary value.
-        """
-        return self.read_key(section, key, dict)
+    def get_site_int(self, section: str, key: str) -> int:
+        """Read an integer value from the site configuration."""
+        return self.read_key(section, key, int, from_site=True)
+
+    def get_site_float(self, section: str, key: str) -> float:
+        """Read a float value from the site configuration."""
+        return self.read_key(section, key, float, from_site=True)
+
+    def get_site_bool(self, section: str, key: str) -> bool:
+        """Read a boolean value from the site configuration."""
+        return self.read_key(section, key, bool, from_site=True)
+
+    def get_site_list(self, section: str, key: str) -> List[str]:
+        """Read a list value from the site configuration."""
+        return self.read_key(section, key, list, from_site=True)
+
+    def get_site_dict(self, section: str, key: str) -> dict:
+        """Read a dictionary value from the site configuration."""
+        return self.read_key(section, key, dict, from_site=True)
 
-    def set_key(self, section: str, key: str, value: Any) -> None:
-        """Set a key in the configuration file.
+    def set_key(self, section: str, key: str, value: Any, to_site: bool = False) -> None:
+        """Set a key in the configuration.
 
         Parameters:
-            - section (str): The section in the configuration file.
+            - section (str): The section in the configuration.
             - key (str): The key to be set.
             - value (Any): The value to be associated with the key.
+            - to_site (bool, optional): Whether to set in site config. Default is False.
         """
         try:
-            if section not in self.config:
-                self.config[section] = {}
+            config_target = self.configSite if to_site else self.config
+            
+            if section not in config_target:
+                config_target[section] = {}
 
-            self.config[section][key] = value
-            cache_key = f"{section}.{key}"
+            config_target[section][key] = value
+            cache_key = f"{'site' if to_site else 'config'}.{section}.{key}"
             self.cache[cache_key] = value
-            self.write_config()
 
         except Exception as e:
-            print(f"Error setting key '{key}' in section '{section}': {e}")
+            print(f"Error setting key '{key}' in section '{section}' of {'site' if to_site else 'main'} config: {e}")
 
     def write_config(self) -> None:
-        """Write the configuration to the file."""
+        """Write the main configuration to the file."""
         try:
             with open(self.file_path, 'w') as f:
                 json.dump(self.config, f, indent=4)

StreamingCommunity/Util/headers.py

@@ -7,7 +7,10 @@ import random
 import ua_generator
 
 
-def get_headers() -> str:
+# Variable
+ua =  ua_generator.generate(device='desktop', browser=('chrome', 'edge'))
+
+def get_userAgent() -> str:
     """
     Generate a random user agent to use in HTTP requests.
 
@@ -20,6 +23,10 @@ def get_headers() -> str:
     return user_agent
 
 
+def get_headers() -> dict:
+    return ua.headers.get()
+
+
 def random_headers(referer: str = None):
     """
     Generate random HTTP headers to simulate human-like behavior.

StreamingCommunity/Util/table.py

@@ -85,8 +85,9 @@ class TVShowManager:
             table.add_row(*row_data)
 
         self.console.print(table)
-
-    def run_back_command(self, research_func: dict) -> None:
+    
+    @staticmethod
+    def run_back_command(research_func: dict) -> None:
         """
         Executes a back-end search command by dynamically importing a module and invoking its search function.
 
@@ -116,8 +117,7 @@ class TVShowManager:
             search_func(None)
             
         except Exception as e:
-            self.console.print(f"[red]Error during search: {e}")
-            logging.exception("Error during search execution")
+            logging.error("Error during search execution")
             
         finally:
             if project_root in sys.path:
@@ -181,7 +181,7 @@ class TVShowManager:
                     if self.slice_end > total_items:
                         self.slice_end = total_items
                 elif (key.lower() in ["b", "back"]) and research_func:
-                    self.run_back_command(research_func)
+                    TVShowManager.run_back_command(research_func)
                 else:
                     break
 
@@ -215,7 +215,7 @@ class TVShowManager:
                     self.slice_start = 0
                     self.slice_end = self.step
                 elif (key.lower() in ["b", "back"]) and research_func:
-                    self.run_back_command(research_func)
+                    TVShowManager.run_back_command(research_func)
                 else:
                     break
 

StreamingCommunity/run.py

@@ -27,24 +27,26 @@ from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, Teleg
 
 
 # Config
+SHOW_TRENDING = config_manager.get_bool('DEFAULT', 'show_trending')
 CLOSE_CONSOLE = config_manager.get_bool('DEFAULT', 'not_close')
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
 
 
 
-def run_function(func: Callable[..., None], close_console: bool = False) -> None:
+def run_function(func: Callable[..., None], close_console: bool = False, search_terms: str = None) -> None:
     """
     Run a given function indefinitely or once, depending on the value of close_console.
 
     Parameters:
         func (Callable[..., None]): The function to run.
         close_console (bool, optional): Whether to close the console after running the function once. Defaults to False.
+        search_terms (str, optional): Search terms to use for the function. Defaults to None.
     """
     if close_console:
         while 1:
-            func()
+            func(search_terms)
     else:
-        func()
+        func(search_terms)
 
 
 def load_search_functions():
@@ -134,10 +136,10 @@ def initialize():
         sys.exit(0)
 
     # Trending tmbd
-    print()
-    tmdb.display_trending_films()
-    tmdb.display_trending_tv_shows()
-
+    if SHOW_TRENDING:
+        print()
+        tmdb.display_trending_films()
+        tmdb.display_trending_tv_shows()
 
     # Attempting GitHub update
     try:
@@ -248,9 +250,11 @@ def main(script_id = 0):
         long_option = alias
         parser.add_argument(f'-{short_option}', f'--{long_option}', action='store_true', help=f'Search for {alias.split("_")[0]} on streaming platforms.')
 
+    parser.add_argument('-s', '--search', default=None, help='Search terms')
     # Parse command-line arguments
     args = parser.parse_args()
 
+    search_terms = args.search
     # Map command-line arguments to the config values
     config_updates = {}
 
@@ -282,7 +286,7 @@ def main(script_id = 0):
     # Check which argument is provided and run the corresponding function
     for arg, func in arg_to_function.items():
         if getattr(args, arg):
-            run_function(func)
+            run_function(func, search_terms=search_terms)
             return
 
     # Mapping user input to functions
@@ -335,7 +339,7 @@ def main(script_id = 0):
 
     # Run the corresponding function based on user input
     if category in input_to_function:
-        run_function(input_to_function[category])
+        run_function(input_to_function[category], search_terms = args.search)
     else:
 
         if TELEGRAM_BOT:

{StreamingCommunity-2.6.0.dist-info → StreamingCommunity-2.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: StreamingCommunity
-Version: 2.6.0
+Version: 2.7.0
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -19,7 +19,6 @@ Requires-Dist: unidecode
 Requires-Dist: jsbeautifier
 Requires-Dist: pathvalidate
 Requires-Dist: pycryptodomex
-Requires-Dist: googlesearch-python
 Requires-Dist: ua-generator
 Requires-Dist: qbittorrent-api
 Requires-Dist: python-qbittorrent
@@ -59,7 +58,7 @@ Requires-Dist: pyTelegramBotAPI
 
 # 📋 Table of Contents
 
-- 🌐 [Website available](#website-status)
+- 🔄 [Update Domains](#update-domains)
 - 🛠️ [Installation](#installation)
     - 📦 [PyPI Installation](#1-pypi-installation)
     - 🔄 [Automatic Installation](#2-automatic-installation)
@@ -86,18 +85,15 @@ Requires-Dist: pyTelegramBotAPI
 # Installation
 
 <p align="center">
-  <a href="https://github.com/Arrowar/StreamingCommunity/releases/latest/download/StreamingCommunity_win.exe">
+  <a href="https://github.com/Arrowar/StreamingCommunity/releases/latest/download/StreamingCommunity_win.exe" style="margin: 0 20px;">
     <img src="https://img.shields.io/badge/-Windows-blue.svg?style=for-the-badge&logo=windows" alt="Windows">
   </a>
-  <a href="https://github.com/Arrowar/StreamingCommunity/releases/latest/download/StreamingCommunity_mac">
+  <a href="https://github.com/Arrowar/StreamingCommunity/releases/latest/download/StreamingCommunity_mac" style="margin: 0 20px;">
     <img src="https://img.shields.io/badge/-macOS-black.svg?style=for-the-badge&logo=apple" alt="macOS">
   </a>
-  <a href="https://github.com/Arrowar/StreamingCommunity/releases/latest/download/StreamingCommunity_linux">
+  <a href="https://github.com/Arrowar/StreamingCommunity/releases/latest/download/StreamingCommunity_linux" style="margin: 0 20px;">
     <img src="https://img.shields.io/badge/-Linux-orange.svg?style=for-the-badge&logo=linux" alt="Linux">
   </a>
-  <a href="https://github.com/Arrowar/StreamingCommunity/releases">
-    <img src="https://img.shields.io/badge/-All_Versions-lightgrey.svg?style=for-the-badge" alt="All Versions">
-  </a>
 </p>
 
 
@@ -478,6 +474,40 @@ You can download VLC Media Player from the [official website](https://www.videol
 - `get_only_link`: Return M3U8 playlist/index URL instead of downloading
 
 
+## Update Domains
+
+There are two ways to update the domains for the supported websites:
+
+### 1. Using Local Configuration
+
+1. Create a `domains.json` file in the root directory of the project
+
+2. Add your domain configuration in the following format:
+   ```json
+   {
+      "altadefinizione": {
+          "domain": "si",
+          "full_url": "https://altadefinizione.si/"
+      },
+      ...
+   }
+   ```
+   
+3. Set `use_api` to `false` in the `DEFAULT` section of your `config.json`:
+   ```json
+   {
+      "DEFAULT": {
+         "use_api": false
+      }
+   }
+   ```
+
+### 2. Using API (Legacy)
+
+The API-based domain updates are currently deprecated. To use it anyway, set `use_api` to `true` in your `config.json` file.
+
+Note: If `use_api` is set to `false` and no `domains.json` file is found, the script will raise an error.
+
 # COMMAND
 
 - Download a specific season by entering its number.
@@ -587,21 +617,6 @@ Start the bot from the folder /StreamingCommunity/TelegramHelp
 python3 telegram_bot.py
 ```
 
-# Website Status
-
-| Website            | Status | Command |
-|:-------------------|:------:|:--------:|
-| [1337xx](https://1337xx.to/) |   ✅   | -133 |
-| [AltadefinizioneGratis](https://altadefinizionegratis.pro/) |   ✅   | -ALT |
-| [AnimeUnity](https://animeunity.so/) |   ✅   | -ANI |
-| [Ilcorsaronero](https://ilcorsaronero.link/) | ✅ | `-ILC` |
-| [CB01New](https://cb01new.gold/) |   ✅   | -CB0 |
-| [DDLStreamItaly](https://ddlstreamitaly.co/) |   ✅   | -DDL |
-| [GuardaSerie](https://guardaserie.now/) |   ✅   | -GUA |
-| [MostraGuarda](https://mostraguarda.stream/) |   ✅   | -MOS |
-| [StreamingCommunity](https://streamingcommunity.paris/) |   ✅   | -STR |
-
-
 # Tutorials
 
 - [Windows Tutorial](https://www.youtube.com/watch?v=mZGqK4wdN-k)