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

StreamingCommunity/Util/headers.py

@@ -10,47 +10,11 @@ import ua_generator
 # Variable
 ua =  ua_generator.generate(device='desktop', browser=('chrome', 'edge'))
 
+
 def get_userAgent() -> str:
-    """
-    Generate a random user agent to use in HTTP requests.
-
-    Returns:
-        - str: A random user agent string.
-    """
-    
-    # Get a random user agent string from the user agent rotator
     user_agent =  ua_generator.generate().text
     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.
-
-    Returns:
-        dict: Generated HTTP headers.
-    """
-    ua = ua_generator.generate()
-
-    headers = {
-        'User-Agent': ua.text,
-        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
-        'Accept-Language': random.choice(['en-US', 'en-GB', 'fr-FR', 'es-ES', 'de-DE']),
-        'Accept-Encoding': 'gzip, deflate, br',
-        'Connection': 'keep-alive',
-        'Upgrade-Insecure-Requests': '1',
-        'Sec-Fetch-Dest': 'document',
-        'Sec-Fetch-Mode': 'navigate',
-        'Sec-Fetch-Site': 'none',
-        'Sec-Fetch-User': '?1',
-    }
-
-    if referer:
-        headers['Origin'] = referer
-        headers['Referer'] = referer
-    
-    return headers
+    return ua.headers.get()

StreamingCommunity/Util/logger.py

@@ -6,57 +6,87 @@ from logging.handlers import RotatingFileHandler
 
 
 # Internal utilities
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 
 
 class Logger:
+    _instance = None
+    
+    def __new__(cls):
+        # Singleton pattern to avoid multiple logger instances
+        if cls._instance is None:
+            cls._instance = super(Logger, cls).__new__(cls)
+            cls._instance._initialized = False
+        return cls._instance
+        
     def __init__(self):
-
-        # Fetching configuration values
-        self.DEBUG_MODE = config_manager.get_bool("DEFAULT", "debug")
-        self.log_to_file = config_manager.get_bool("DEFAULT", "log_to_file")
-        self.log_file = config_manager.get("DEFAULT", "log_file") if self.log_to_file else None
-
+        # Initialize only once
+        if getattr(self, '_initialized', False):
+            return
+        
+        # Fetch only the debug setting from config
+        self.debug_mode = config_manager.get_bool("DEFAULT", "debug")
+        
+        # Configure root logger
+        self.logger = logging.getLogger('')
+        
+        # Remove any existing handlers to avoid duplication
+        for handler in self.logger.handlers[:]:
+            self.logger.removeHandler(handler)
+        
+        # Reduce logging level for external libraries
         logging.getLogger("httpx").setLevel(logging.WARNING)
         logging.getLogger("httpcore").setLevel(logging.WARNING)
-
         
-        # Setting logging level based on DEBUG_MODE
-        if self.DEBUG_MODE:
-            logging.getLogger('root').setLevel(logging.DEBUG)
+        # Set logging level based on debug_mode
+        if self.debug_mode:
+            self.logger.setLevel(logging.DEBUG)
+            self._configure_console_log_file()
 
-            # Configure file logging if debug mode and logging to file are both enabled
-            if self.log_to_file:
-                self.remove_existing_log_file()
-                self.configure_file_logging()
         else:
-
-            # If DEBUG_MODE is False, set logging level to ERROR
-            logging.getLogger('root').setLevel(logging.ERROR)
-
-        # Configure console logging
-        self.configure_logging()
-
-    def configure_logging(self):
-        """
-        Configure console logging.
-        """
-        logging.basicConfig(level=logging.DEBUG, format='[%(filename)s:%(lineno)s - %(funcName)20s() ] %(asctime)s - %(levelname)s - %(message)s')
-
-    def configure_file_logging(self):
-        """
-        Configure file logging if enabled.
-        """
-
-        file_handler = RotatingFileHandler(self.log_file, maxBytes=10*1024*1024, backupCount=5)
-        file_handler.setLevel(logging.DEBUG)
+            self.logger.setLevel(logging.ERROR)
+        
+        # Configure console logging (terminal output) regardless of debug mode
+        self._configure_console_logging()
+        
+        self._initialized = True
+        
+    def _configure_console_logging(self):
+        """Configure console logging output to terminal."""
+        console_handler = logging.StreamHandler()
+        console_handler.setLevel(logging.DEBUG if self.debug_mode else logging.ERROR)
         formatter = logging.Formatter('[%(filename)s:%(lineno)s - %(funcName)20s() ] %(asctime)s - %(levelname)s - %(message)s')
-        file_handler.setFormatter(formatter)
-        logging.getLogger('').addHandler(file_handler)
-
-    def remove_existing_log_file(self):
+        console_handler.setFormatter(formatter)
+        self.logger.addHandler(console_handler)
+            
+    def _configure_console_log_file(self):
+        """Create a console.log file only when debug mode is enabled."""
+        console_log_path = "console.log"
+        try:
+            # Remove existing file if present
+            if os.path.exists(console_log_path):
+                os.remove(console_log_path)
+                
+            # Create handler for console.log
+            console_file_handler = RotatingFileHandler(
+                console_log_path,
+                maxBytes=5*1024*1024,  # 5 MB
+                backupCount=3
+            )
+            console_file_handler.setLevel(logging.DEBUG)
+            formatter = logging.Formatter('[%(filename)s:%(lineno)s - %(funcName)20s() ] %(asctime)s - %(levelname)s - %(message)s')
+            console_file_handler.setFormatter(formatter)
+            self.logger.addHandler(console_file_handler)
+            
+        except Exception as e:
+            print(f"Error creating console.log: {e}")
+            
+    @staticmethod
+    def get_logger(name=None):
         """
-        Remove the log file if it already exists.
+        Get a specific logger for a module/component.
+        If name is None, returns the root logger.
         """
-        if os.path.exists(self.log_file):
-            os.remove(self.log_file)
+        # Ensure Logger instance is initialized
+        Logger()
+        return logging.getLogger(name)

StreamingCommunity/Util/message.py

@@ -3,12 +3,17 @@
 import os
 import platform
 
+
+# External library
+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
 
 
 # Variable
+console = Console()
 CLEAN = config_manager.get_bool('DEFAULT', 'clean_console')
 SHOW = config_manager.get_bool('DEFAULT', 'show_message')
 
@@ -33,4 +38,4 @@ def start_message():
 
         # Print a decorative separator line using asterisks
         separator = "_" * (console.width - 2)  # Ridotto di 2 per il padding
-        console.print(f"[cyan]{separator}[/cyan]\n")
+        console.print(f"[cyan]{separator}[/cyan]\n")

StreamingCommunity/Util/os.py

@@ -9,9 +9,9 @@ import shutil
 import hashlib
 import logging
 import platform
+import inspect
 import subprocess
 import contextlib
-import urllib.request
 import importlib.metadata
 from pathlib import Path
 
@@ -19,14 +19,19 @@ from pathlib import Path
 # External library
 import httpx
 from unidecode import unidecode
+from rich.console import Console
+from rich.prompt import Prompt
 from pathvalidate import sanitize_filename, sanitize_filepath
 
 
 # Internal utilities
 from .ffmpeg_installer import check_ffmpeg
-from StreamingCommunity.Util.console import console, msg
 
 
+# Variable
+msg = Prompt()
+console = Console()
+
 
 class OsManager:
     def __init__(self):
@@ -243,7 +248,6 @@ class OsManager:
 
 
 class InternManager():
-
     def format_file_size(self, size_bytes: float) -> str:
         """
         Formats a file size from bytes into a human-readable string representation.
@@ -283,20 +287,8 @@ class InternManager():
         else:
             return f"{bytes / (1024 * 1024):.2f} MB/s"
 
-    @staticmethod
-    def check_internet():
-        while True:
-            try:
-                httpx.get("https://www.google.com", timeout=5)
-                break
-
-            except Exception as e:
-                console.log("[bold red]Internet is not available. Waiting...[/bold red]")
-                time.sleep(2)
-
 
 class OsSummary:
-
     def __init__(self):
         self.ffmpeg_path = None
         self.ffprobe_path = None
@@ -343,32 +335,6 @@ class OsSummary:
         except importlib.metadata.PackageNotFoundError:
             return f"{lib_name}-not installed"
 
-    def download_requirements(self, url: str, filename: str):
-        """
-        Download the requirements.txt 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.
-        """
-        try:
-            import requests
-
-            logging.info(f"{filename} not found locally. Downloading from {url}...")
-            response = requests.get(url)
-
-            if response.status_code == 200:
-                with open(filename, 'wb') as f:
-                    f.write(response.content)
-
-            else:
-                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}")
-            sys.exit(0)
-
     def install_library(self, lib_name: str):
         """
         Install a Python library using pip.
@@ -399,17 +365,6 @@ class OsSummary:
 
     def get_system_summary(self):
         self.check_python_version()
-        InternManager().check_internet()
-
-        # Python info
-        python_version = sys.version.split()[0]
-        python_implementation = platform.python_implementation()
-        arch = platform.machine()
-        os_info = platform.platform()
-        glibc_version = 'glibc ' + '.'.join(map(str, platform.libc_ver()[1]))
-
-        console.print(f"[cyan]Python[white]: [bold red]{python_version} ({python_implementation} {arch}) - {os_info} ({glibc_version})[/bold red]")
-        logging.info(f"Python: {python_version} ({python_implementation} {arch}) - {os_info} ({glibc_version})")
 
         # FFmpeg detection
         binary_dir = self.get_binary_directory()
@@ -453,33 +408,7 @@ class OsSummary:
             console.log("[red]Can't locate ffmpeg or ffprobe")
             sys.exit(0)
 
-        console.print(f"[cyan]Path[white]: [red]ffmpeg [bold yellow]'{self.ffmpeg_path}'[/bold yellow][white], [red]ffprobe '[bold yellow]{self.ffprobe_path}'[/bold yellow]")
-
-        # Handle requirements.txt
-        if not getattr(sys, 'frozen', False):
-            requirements_file = 'requirements.txt'
-
-            requirements_file = Path(__file__).parent.parent.parent / requirements_file
-
-            if not os.path.exists(requirements_file):
-                self.download_requirements(
-                    'https://raw.githubusercontent.com/Arrowar/StreamingCommunity/refs/heads/main/requirements.txt',
-                    requirements_file
-                )
-
-            optional_libraries = [line.strip().split("=")[0] for line in open(requirements_file, 'r', encoding='utf-8-sig')]
-
-            for lib in optional_libraries:
-                installed_version = self.get_library_version(lib.split("<")[0])
-                if 'not installed' in installed_version:
-                    user_response = msg.ask(f"{lib} is not installed. Do you want to install it? (yes/no)", default="y")
-                    if user_response.lower().strip() in ["yes", "y"]:
-                        self.install_library(lib)
-                else:
-                    logging.info(f"Library: {installed_version}")
-
-            #console.print(f"[cyan]Libraries[white]: [bold red]{', '.join([self.get_library_version(lib) for lib in optional_libraries])}[/bold red]\n")
-            logging.info(f"Libraries: {', '.join([self.get_library_version(lib) for lib in optional_libraries])}")
+        console.print(f"[cyan]Path: [red]ffmpeg [bold yellow]'{self.ffmpeg_path}'[/bold yellow][white], [red]ffprobe '[bold yellow]{self.ffprobe_path}'[/bold yellow]")
 
 
 os_manager = OsManager()
@@ -493,17 +422,36 @@ def suppress_output():
         yield
 
 def compute_sha1_hash(input_string: str) -> str:
-    """
-    Computes the SHA-1 hash of the input string.
-
-    Parameters:
-        - input_string (str): The string to be hashed.
-
-    Returns:
-        str: The SHA-1 hash of the input string.
-    """
-    # Compute the SHA-1 hash
-    hashed_string = hashlib.sha1(input_string.encode()).hexdigest()
-
-    # Return the hashed string
-    return hashed_string
+    """Computes the SHA-1 hash of the input string."""
+    return hashlib.sha1(input_string.encode()).hexdigest()
+
+def get_call_stack():
+    """Retrieves the current call stack with details about each call."""
+    stack = inspect.stack()
+    call_stack = []
+
+    for frame_info in stack:
+        function_name = frame_info.function
+        filename = frame_info.filename
+        lineno = frame_info.lineno
+        folder_name = os.path.dirname(filename)
+        folder_base = os.path.basename(folder_name)
+        script_name = os.path.basename(filename)
+
+        call_stack.append({
+            "function": function_name,
+            "folder": folder_name,
+            "folder_base": folder_base,
+            "script": script_name,
+            "line": lineno
+        })
+        
+    return call_stack
+
+def get_ffmpeg_path():
+    """Returns the path of FFmpeg."""
+    return os_summary.ffmpeg_path
+
+def get_ffprobe_path():
+    """Returns the path of FFprobe."""
+    return os_summary.ffprobe_path

StreamingCommunity/Util/table.py

@@ -16,12 +16,13 @@ from rich.style import Style
 
 
 # Internal utilities
+from .os import get_call_stack
 from .message import start_message
-from .call_stack import get_call_stack
+
 
 # Telegram bot instance
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
 
 
@@ -31,21 +32,11 @@ class TVShowManager:
         """Initialize TVShowManager with default values."""
         self.console = Console()
         self.tv_shows: List[Dict[str, Any]] = []
-        self.slice_start: int = 0
-        self.slice_end: int = 5
-        self.step: int = self.slice_end
+        self.slice_start = 0
+        self.slice_end = 10
+        self.step = self.slice_end
         self.column_info = []
 
-    def set_slice_end(self, new_slice: int) -> None:
-        """
-        Set the end of the slice for displaying TV shows.
-
-        Parameters:
-            - new_slice (int): The new value for the slice end.
-        """
-        self.slice_end = new_slice
-        self.step = new_slice
-
     def add_column(self, column_info: Dict[str, Dict[str, str]]) -> None:
         """
         Add column information.
@@ -164,7 +155,7 @@ class TVShowManager:
                 else:
                     choices = [str(i) for i in range(max_int_input + 1)] + ["q", "quit", "b", "back"]
                     prompt_msg = "[cyan]Insert media [red]index"
-                    telegram_msg = "Scegli il contenuto da scaricare:\n📺 Serie TV - 🎞️ Film - 🌀 Anime\noppure `back` per tornare indietro"
+                    telegram_msg = "Scegli il contenuto da scaricare:\n Serie TV -  Film -  Anime\noppure `back` per tornare indietro"
                     
                     if is_telegram:
                         key = bot.ask("select_title", telegram_msg, None)
@@ -200,7 +191,7 @@ class TVShowManager:
                 else:
                     choices = [str(i) for i in range(max_int_input + 1)] + ["q", "quit", "b", "back"]
                     prompt_msg = "[cyan]Insert media [red]index"
-                    telegram_msg = "Scegli il contenuto da scaricare:\n📺 Serie TV - 🎞️ Film - 🌀 Anime\noppure `back` per tornare indietro"
+                    telegram_msg = "Scegli il contenuto da scaricare:\n Serie TV -  Film -  Anime\noppure `back` per tornare indietro"
                     
                     if is_telegram:
                         key = bot.ask("select_title", telegram_msg, None)

StreamingCommunity/run.py

@@ -12,17 +12,18 @@ import threading, asyncio
 from typing import Callable
 
 
+# External library
+from rich.console import Console
+from rich.prompt import Prompt
+
+
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
-from StreamingCommunity.Util.console import console, msg
-from StreamingCommunity.Util._jsonConfig import config_manager
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.os import os_summary
 from StreamingCommunity.Util.logger import Logger
 from StreamingCommunity.Upload.update import update as git_update
 from StreamingCommunity.Lib.TMBD import tmdb
-
-
-# Telegram util
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
 
 
@@ -32,6 +33,10 @@ CLOSE_CONSOLE = config_manager.get_bool('DEFAULT', 'not_close')
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
 
 
+# Variable
+console = Console()
+msg = Prompt()
+
 
 def run_function(func: Callable[..., None], close_console: bool = False, search_terms: str = None) -> None:
     """
@@ -149,7 +154,7 @@ def initialize():
 
 def restart_script():
     """Riavvia lo script con gli stessi argomenti della riga di comando."""
-    print("\n🔄 Riavvio dello script...\n")
+    print("\nRiavvio dello script...\n")
     python = sys.executable
     os.execv(python, [python] + sys.argv)
 
@@ -157,31 +162,31 @@ def restart_script():
 def force_exit():
     """Forza la chiusura dello script in qualsiasi contesto."""
 
-    print("\n🛑 Chiusura dello script in corso...")
+    print("\nChiusura dello script in corso...")
 
-    # 1️⃣ Chiudi tutti i thread tranne il principale
+    # 1 Chiudi tutti i thread tranne il principale
     for t in threading.enumerate():
         if t is not threading.main_thread():
-            print(f"🔄 Chiusura thread: {t.name}")
+            print(f"Chiusura thread: {t.name}")
             t.join(timeout=1)
 
-    # 2️⃣ Ferma asyncio, se attivo
+    # 2 Ferma asyncio, se attivo
     try:
         loop = asyncio.get_event_loop()
         if loop.is_running():
-            print("⚡ Arresto del loop asyncio...")
+            print("Arresto del loop asyncio...")
             loop.stop()
     except RuntimeError:
         pass
 
-    # 3️⃣ Esce con sys.exit(), se fallisce usa os._exit()
+    # 3 Esce con sys.exit(), se fallisce usa os._exit()
     try:
-        print("✅ Uscita con sys.exit(0)")
+        print("Uscita con sys.exit(0)")
         sys.exit(0)
     except SystemExit:
         pass
 
-    print("🚨 Uscita forzata con os._exit(0)")
+    print("Uscita forzata con os._exit(0)")
     os._exit(0)
 
 
@@ -189,7 +194,7 @@ def main(script_id = 0):
 
     if TELEGRAM_BOT:
         bot = get_bot_instance()
-        bot.send_message(f"🏁 Avviato script {script_id}", None)
+        bot.send_message(f"Avviato script {script_id}", None)
 
     start = time.time()
 
@@ -212,9 +217,6 @@ def main(script_id = 0):
     parser.add_argument(
         '--add_siteName', type=bool, help='Enable or disable adding the site name to the file name (e.g., true/false).'
     )
-    parser.add_argument(
-        '--disable_searchDomain', type=bool, help='Enable or disable searching in configured domains (e.g., true/false).'
-    )
     parser.add_argument(
         '--not_close', type=bool, help='If set to true, the script will not close the console after execution (e.g., true/false).'
     )
@@ -260,8 +262,6 @@ def main(script_id = 0):
 
     if args.add_siteName is not None:
         config_updates['DEFAULT.add_siteName'] = args.add_siteName
-    if args.disable_searchDomain is not None:
-        config_updates['DEFAULT.disable_searchDomain'] = args.disable_searchDomain
     if args.not_close is not None:
         config_updates['DEFAULT.not_close'] = args.not_close
     if args.default_video_worker is not None:
@@ -305,24 +305,15 @@ def main(script_id = 0):
     ) + "[white])"
 
     if TELEGRAM_BOT:
-
-        # Mappa delle emoji per i colori
-        emoji_map = {
-            "yellow": "🟡",  # Giallo
-            "red": "🔴",     # Rosso
-            "blue": "🔵",    # Blu
-            "green": "🟢"    # Verde
-        }
-
+        
         # Display the category legend in a single line
         category_legend_str = "Categorie: \n" + " | ".join([
-            f"{emoji_map.get(color, '⚪')} {category.capitalize()}"
-            for category, color in color_map.items()
+            f"{category.capitalize()}" for category in color_map.keys()
         ])
 
-        # Costruisci il messaggio con le emoji al posto dei colori
+        # Costruisci il messaggio senza emoji
         prompt_message = "Inserisci il sito:\n" + "\n".join(
-            [f"{key}: {emoji_map[color_map[label[1]]]} {label[0]}" for key, label in choice_labels.items()]
+            [f"{key}: {label[0]}" for key, label in choice_labels.items()]
         )
 
         console.print(f"\n{prompt_message}")
@@ -340,6 +331,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], search_terms = args.search)
+        
     else:
 
         if TELEGRAM_BOT:
@@ -358,4 +350,4 @@ def main(script_id = 0):
                 # Delete script_id
                 script_id = TelegramSession.get_session()
                 if script_id != "unknown":
-                    TelegramSession.deleteScriptId(script_id)
+                    TelegramSession.deleteScriptId(script_id)