StreamingCommunity 2.5.6__py3-none-any.whl → 2.5.8__py3-none-any.whl

StreamingCommunity/Util/os.py

@@ -13,6 +13,7 @@ import subprocess
 import contextlib
 import urllib.request
 import importlib.metadata
+from pathlib import Path
 
 
 # External library
@@ -67,7 +68,7 @@ class OsManager:
 
         # Convert Windows separators to Unix
         normalized = path.replace('\\', '/')
-        
+
         # Ensure absolute paths start with /
         if normalized.startswith('/'):
             return os.path.normpath(normalized)
@@ -82,17 +83,17 @@ class OsManager:
         # Decode and sanitize
         decoded = unidecode(filename)
         sanitized = sanitize_filename(decoded)
-        
+
         # Split name and extension
         name, ext = os.path.splitext(sanitized)
-        
+
         # Calculate available length for name considering the '...' and extension
         max_name_length = self.max_length - len('...') - len(ext)
-        
+
         # Truncate name if it exceeds the max name length
         if len(name) > max_name_length:
             name = name[:max_name_length] + '...'
-        
+
         # Ensure the final file name includes the extension
         return name + ext
 
@@ -103,7 +104,7 @@ class OsManager:
 
         # Decode unicode characters
         decoded = unidecode(path)
-        
+
         # Basic path sanitization
         sanitized = sanitize_filepath(decoded)
 
@@ -121,7 +122,7 @@ class OsManager:
                         if part
                     ])
                 return '\\'.join(sanitized_parts)
-            
+
             # Handle drive letters
             elif len(path) >= 2 and path[1] == ':':
                 drive = path[:2]
@@ -132,7 +133,7 @@ class OsManager:
                     if part
                 ]
                 return '\\'.join(path_parts)
-                
+
             # Regular path
             else:
                 parts = path.replace('/', '\\').split('\\')
@@ -146,21 +147,21 @@ class OsManager:
                 for part in parts
                 if part
             ]
-            
+
             result = '/'.join(sanitized_parts)
             if is_absolute:
                 result = '/' + result
-                
+
             return result
-        
+
     def create_path(self, path: str, mode: int = 0o755) -> bool:
         """
         Create directory path with specified permissions.
-        
+
         Args:
             path (str): Path to create.
             mode (int, optional): Directory permissions. Defaults to 0o755.
-        
+
         Returns:
             bool: True if path created successfully, False otherwise.
         """
@@ -168,7 +169,7 @@ class OsManager:
             sanitized_path = self.get_sanitize_path(path)
             os.makedirs(sanitized_path, mode=mode, exist_ok=True)
             return True
-        
+
         except Exception as e:
             logging.error(f"Path creation error: {e}")
             return False
@@ -176,21 +177,21 @@ class OsManager:
     def remove_folder(self, folder_path: str) -> bool:
         """
         Safely remove a folder.
-        
+
         Args:
             folder_path (str): Path of directory to remove.
-        
+
         Returns:
             bool: Removal status.
         """
         try:
             shutil.rmtree(folder_path)
             return True
-        
+
         except OSError as e:
             logging.error(f"Folder removal error: {e}")
             return False
-    
+
     def remove_files_except_one(self, folder_path: str, keep_file: str) -> None:
         """
         Delete all files in a folder except for one specified file.
@@ -201,21 +202,27 @@ class OsManager:
         """
 
         try:
-            # List all files in the folder
-            files_in_folder = os.listdir(folder_path)
+            # First, try to make all files writable
+            for root, dirs, files in os.walk(self.temp_dir):
+                for dir_name in dirs:
+                    dir_path = os.path.join(root, dir_name)
+                    os.chmod(dir_path, 0o755)  # rwxr-xr-x
+                for file_name in files:
+                    file_path = os.path.join(root, file_name)
+                    os.chmod(file_path, 0o644)  # rw-r--r--
             
-            # Iterate over each file in the folder
-            for file_name in files_in_folder:
-                file_path = os.path.join(folder_path, file_name)
+            # Then remove the directory tree
+            shutil.rmtree(self.temp_dir, ignore_errors=True)
+            
+            # If directory still exists after rmtree, try force remove
+            if os.path.exists(self.temp_dir):
+                import subprocess
+                subprocess.run(['rm', '-rf', self.temp_dir], check=True)
                 
-                # Check if the file is not the one to keep and is a regular file
-                if file_name != keep_file and os.path.isfile(file_path):
-                    os.remove(file_path)  # Delete the file
-
         except Exception as e:
-            logging.error(f"An error occurred: {e}")
-            raise
-    
+            logging.error(f"Failed to cleanup temporary directory: {str(e)}")
+            pass
+
     def check_file(self, file_path: str) -> bool:
         """
         Check if a file exists at the given file path.
@@ -229,7 +236,7 @@ class OsManager:
         try:
             logging.info(f"Check if file exists: {file_path}")
             return os.path.exists(file_path)
-            
+
         except Exception as e:
             logging.error(f"An error occurred while checking file existence: {e}")
             return False
@@ -280,12 +287,12 @@ class InternManager():
     def check_internet():
         while True:
             try:
-                httpx.get("https://www.google.com", timeout=15)
+                httpx.get("https://www.google.com", timeout=5)
                 break
 
-            except urllib.error.URLError:
+            except Exception as e:
                 console.log("[bold red]Internet is not available. Waiting...[/bold red]")
-                time.sleep(5)
+                time.sleep(2)
 
 
 class OsSummary:
@@ -299,7 +306,7 @@ class OsSummary:
         """Get the binary directory based on OS."""
         system = platform.system().lower()
         home = os.path.expanduser('~')
-        
+
         if system == 'windows':
             return os.path.join(os.path.splitdrive(home)[0] + os.path.sep, 'binary')
         elif system == 'darwin':
@@ -315,41 +322,41 @@ class OsSummary:
         try:
             result = subprocess.check_output(command, text=True).strip()
             return result.split('\n')[0] if result else None
-        
+
         except subprocess.CalledProcessError:
             return None
 
     def get_library_version(self, lib_name: str):
         """
         Retrieve the version of a Python library.
-        
+
         Args:
             lib_name (str): The name of the Python library.
-        
+
         Returns:
             str: The library name followed by its version, or `-not installed` if not found.
         """
         try:
             version = importlib.metadata.version(lib_name)
             return f"{lib_name}-{version}"
-        
+
         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)
@@ -357,7 +364,7 @@ class OsSummary:
             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)
@@ -373,7 +380,7 @@ class OsSummary:
             console.print(f"Installing {lib_name}...", style="bold yellow")
             subprocess.check_call([sys.executable, "-m", "pip", "install", lib_name])
             console.print(f"{lib_name} installed successfully!", style="bold green")
-            
+
         except subprocess.CalledProcessError as e:
             console.print(f"Failed to install {lib_name}: {e}", style="bold red")
             sys.exit(1)
@@ -400,7 +407,7 @@ class OsSummary:
         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})")
 
@@ -408,10 +415,10 @@ class OsSummary:
         binary_dir = self.get_binary_directory()
         system = platform.system().lower()
         arch = platform.machine().lower()
-        
+
         # Map architecture names
         arch_map = {
-            'amd64': 'x64', 
+            'amd64': 'x64',
             'x86_64': 'x64',
             'x64': 'x64',
             'arm64': 'arm64',
@@ -424,15 +431,15 @@ class OsSummary:
 
         # Check binary directory
         if os.path.exists(binary_dir):
-            
+
             # Search for any file containing 'ffmpeg' and the architecture
             ffmpeg_files = glob.glob(os.path.join(binary_dir, f'*ffmpeg*{arch}*'))
             ffprobe_files = glob.glob(os.path.join(binary_dir, f'*ffprobe*{arch}*'))
-            
+
             if ffmpeg_files and ffprobe_files:
                 self.ffmpeg_path = ffmpeg_files[0]
                 self.ffprobe_path = ffprobe_files[0]
-                
+
                 # Set executable permissions if needed
                 if system != 'windows':
                     os.chmod(self.ffmpeg_path, 0o755)
@@ -451,24 +458,26 @@ class OsSummary:
         # 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)
+                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])}")
 
@@ -495,6 +504,6 @@ def compute_sha1_hash(input_string: str) -> str:
     """
     # Compute the SHA-1 hash
     hashed_string = hashlib.sha1(input_string.encode()).hexdigest()
-    
+
     # Return the hashed string
     return hashed_string

StreamingCommunity/Util/table.py

@@ -4,6 +4,8 @@ import os
 import sys
 import logging
 import importlib
+from pathlib import Path
+from typing import Dict, List, Any
 
 
 # External library
@@ -11,7 +13,6 @@ from rich.console import Console
 from rich.table import Table
 from rich.prompt import Prompt
 from rich.style import Style
-from typing import Dict, List, Any
 
 
 # Internal utilities
@@ -24,13 +25,12 @@ from StreamingCommunity.Util._jsonConfig import config_manager
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
 
 
+
 class TVShowManager:
     def __init__(self):
-        """
-        Initialize TVShowManager with provided column information.
-        """
+        """Initialize TVShowManager with default values."""
         self.console = Console()
-        self.tv_shows: List[Dict[str, Any]] = []  # List to store TV show data as dictionaries
+        self.tv_shows: List[Dict[str, Any]] = []
         self.slice_start: int = 0
         self.slice_end: int = 5
         self.step: int = self.slice_end
@@ -55,7 +55,7 @@ class TVShowManager:
         """
         self.column_info = column_info
 
-    def add_tv_show(self, tv_show: Dict[str, Any]):
+    def add_tv_show(self, tv_show: Dict[str, Any]) -> None:
         """
         Add a TV show to the list of TV shows.
 
@@ -64,7 +64,7 @@ class TVShowManager:
         """
         self.tv_shows.append(tv_show)
 
-    def display_data(self, data_slice: List[Dict[str, Any]]):
+    def display_data(self, data_slice: List[Dict[str, Any]]) -> None:
         """
         Display TV show data in a tabular format.
 
@@ -76,21 +76,17 @@ class TVShowManager:
         # Add columns dynamically based on provided column information
         for col_name, col_style in self.column_info.items():
             color = col_style.get("color", None)
-            if color:
-                style = Style(color=color)
-            else:
-                style = None
+            style = Style(color=color) if color else None
             table.add_column(col_name, style=style, justify='center')
 
         # Add rows dynamically based on available TV show data
         for entry in data_slice:
-            # Create row data while handling missing keys
-            row_data = [entry.get(col_name, '') for col_name in self.column_info.keys()]
+            row_data = [str(entry.get(col_name, '')) for col_name in self.column_info.keys()]
             table.add_row(*row_data)
 
         self.console.print(table)
 
-    def run_back_command(self, research_func: dict):
+    def run_back_command(self, research_func: dict) -> None:
         """
         Executes a back-end search command by dynamically importing a module and invoking its search function.
 
@@ -99,46 +95,33 @@ class TVShowManager:
                 - 'folder' (str): The absolute path to the directory containing the module to be executed.
         """
         try:
-
             # Get site name from folder
-            site_name = (os.path.basename(research_func['folder']))
+            site_name = Path(research_func['folder']).name
 
             # Find the project root directory
             current_path = research_func['folder']
             while not os.path.exists(os.path.join(current_path, 'StreamingCommunity')):
                 current_path = os.path.dirname(current_path)
             
-            # Add project root to Python path
             project_root = current_path
-            #print(f"[DEBUG] Project Root: {project_root}")
-            
             if project_root not in sys.path:
                 sys.path.insert(0, project_root)
             
             # Import using full absolute import
             module_path = f'StreamingCommunity.Api.Site.{site_name}'
-            #print(f"[DEBUG] Importing module: {module_path}")
-            
-            # Import the module
             module = importlib.import_module(module_path)
             
-            # Get the search function
+            # Get and call the search function
             search_func = getattr(module, 'search')
-            
-            # Call the search function with the search string
             search_func(None)
             
         except Exception as e:
             self.console.print(f"[red]Error during search: {e}")
+            logging.exception("Error during search execution")
             
-            # Print detailed traceback
-            import traceback
-            traceback.print_exc()
-        
-        # Optionally remove the path if you want to clean up
-        if project_root in sys.path:
-            sys.path.remove(project_root)
-
+        finally:
+            if project_root in sys.path:
+                sys.path.remove(project_root)
 
     def run(self, force_int_input: bool = False, max_int_input: int = 0) -> str:
         """
@@ -152,121 +135,92 @@ class TVShowManager:
             str: Last command executed before breaking out of the loop.
         """
         total_items = len(self.tv_shows)
-        last_command = ""  # Variable to store the last command executed
+        last_command = ""
+        is_telegram = config_manager.get_bool('DEFAULT', 'telegram_bot')
+        bot = get_bot_instance() if is_telegram else None
 
-        if TELEGRAM_BOT:
-          bot = get_bot_instance()
-          
         while True:
             start_message()
-
-            # Display table
             self.display_data(self.tv_shows[self.slice_start:self.slice_end])
 
             # Find research function from call stack
-            research_func = None
-            for reverse_fun in get_call_stack():
-                if reverse_fun['function'] == 'search' and reverse_fun['script'] == '__init__.py':
-                    research_func = reverse_fun
-                    logging.info(f"Found research_func: {research_func}")
+            research_func = next((
+                f for f in get_call_stack()
+                if f['function'] == 'search' and f['script'] == '__init__.py'
+            ), None)
 
-            # Handling user input for loading more items or quitting
+            # Handle pagination and user input
             if self.slice_end < total_items:
                 self.console.print(f"\n[green]Press [red]Enter [green]for next page, [red]'q' [green]to quit, or [red]'back' [green]to search.")
 
                 if not force_int_input:
-                    if TELEGRAM_BOT:
-                      self.console.print(f"\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
-                          "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end")
-                      key = bot.ask(
-                          "select_title_episode",
-                          f"Inserisci l'indice dei media (ad esempio, 1), * per scaricare tutti i media, (ad esempio, 1-2) per un intervallo di media, o (ad esempio, 3-*) per scaricare dal un indice specifico fino alla fine.",
-                          None
-                      )
-                    else:
-                      key = Prompt.ask(
-                        "\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
-                        "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end"
-                    )
+                    prompt_msg = ("\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
+                                "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end")
                     
+                    if is_telegram:
+                        key = bot.ask("select_title_episode", prompt_msg, None)
+                    else:
+                        key = Prompt.ask(prompt_msg)
                 else:
-                    choices = [str(i) for i in range(0, max_int_input)]
-                    choices.extend(["q", "quit", "b", "back"])
-                    if TELEGRAM_BOT:
-                      self.console.print(f"[cyan]Insert media [red]index")
-                      key = bot.ask(
-                        "select_title",
-                        f"Scegli il contenuto da scaricare:\n📺 Serie TV - 🎞️ Film - 🌀 Anime\noppure `back` per tornare indietro",
-                        None
-                      )
+                    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"
+                    
+                    if is_telegram:
+                        key = bot.ask("select_title", telegram_msg, None)
                     else:
-                      key = Prompt.ask("[cyan]Insert media [red]index", choices=choices, show_choices=False)
-                        
+                        key = Prompt.ask(prompt_msg, choices=choices, show_choices=False)
+
                 last_command = key
 
-                if key.lower() == "q" or key.lower() == "quit":
+                if key.lower() in ["q", "quit"]:
                     break
-
                 elif key == "":
                     self.slice_start += self.step
                     self.slice_end += self.step
                     if self.slice_end > total_items:
                         self.slice_end = total_items
-
-                elif (key.lower() == "b" or key.lower() == "back") and research_func:
+                elif (key.lower() in ["b", "back"]) and research_func:
                     self.run_back_command(research_func)
-
                 else:
                     break
 
             else:
-                # Last slice, ensure all remaining items are shown
-                self.console.print(f"\n [green]You've reached the end. [red]Enter [green]for first page, [red]'q' [green]to quit, or [red]'back' [green]to search.")
+                # Last page handling
+                self.console.print(f"\n[green]You've reached the end. [red]Enter [green]for first page, [red]'q' [green]to quit, or [red]'back' [green]to search.")
+                
                 if not force_int_input:
-                    if TELEGRAM_BOT:
-                      self.console.print(f"\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
-                          "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end")
-                      key = bot.ask(
-                          "select_title_episode",
-                          f"Inserisci l'indice dei media (ad esempio, 1), * per scaricare tutti i media, (ad esempio, 1-2) per un intervallo di media, o (ad esempio, 3-*) per scaricare dal un indice specifico fino alla fine.",
-                          None
-                      )
+                    prompt_msg = ("\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
+                                "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end")
+                    
+                    if is_telegram:
+                        key = bot.ask("select_title_episode", prompt_msg, None)
                     else:
-                      key = Prompt.ask(
-                          "\n[cyan]Insert media index [yellow](e.g., 1), [red]* [cyan]to download all media, "
-                          "[yellow](e.g., 1-2) [cyan]for a range of media, or [yellow](e.g., 3-*) [cyan]to download from a specific index to the end"
-                      )
-
+                        key = Prompt.ask(prompt_msg)
                 else:
-                    choices = [str(i) for i in range(0, max_int_input)]
-                    choices.extend(["q", "quit", "b", "back"])
-
-                    if TELEGRAM_BOT:
-                      self.console.print(f"[cyan]Insert media [red]index")
-                      key = bot.ask(
-                        "select_title",
-                        f"Scegli il contenuto da scaricare:\n📺 Serie TV - 🎞️ Film - 🌀 Anime\n oppure `back` per tornare indietro",
-                        None
-                      )
+                    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"
+                    
+                    if is_telegram:
+                        key = bot.ask("select_title", telegram_msg, None)
                     else:
-                      key = Prompt.ask("[cyan]Insert media [red]index", choices=choices, show_choices=False)
-                        
+                        key = Prompt.ask(prompt_msg, choices=choices, show_choices=False)
+
                 last_command = key
 
-                if key.lower() == "q" or key.lower() == "quit":
+                if key.lower() in ["q", "quit"]:
                     break
-
                 elif key == "":
                     self.slice_start = 0
                     self.slice_end = self.step
-
-                elif (key.lower() == "b" or key.lower() == "back") and research_func:
+                elif (key.lower() in ["b", "back"]) and research_func:
                     self.run_back_command(research_func)
-
                 else:
                     break
-            
+
         return last_command
 
-    def clear(self):
+    def clear(self) -> None:
+        """Clear all TV shows data."""
         self.tv_shows = []