StreamingCommunity 3.0.6__py3-none-any.whl → 3.0.8__py3-none-any.whl

StreamingCommunity/Api/Template/site.py

@@ -7,78 +7,123 @@ import sys
 from rich.console import Console
 
 
+# Internal utilities
+from StreamingCommunity.Api.Template.config_loader import site_constant
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
+
 # Variable
 console = Console()
 available_colors = ['red', 'magenta', 'yellow', 'cyan', 'green', 'blue', 'white']
 column_to_hide = ['Slug', 'Sub_ita', 'Last_air_date', 'Seasons_count', 'Url', 'Image', 'Path_id']
 
 
-def get_select_title(table_show_manager, media_search_manager):
+def get_select_title(table_show_manager, media_search_manager, num_results_available): 
     """
     Display a selection of titles and prompt the user to choose one.
+    Handles both console and Telegram bot input.
+
+    Parameters:
+        table_show_manager: Manager for console table display.
+        media_search_manager: Manager holding the list of media items.
+        num_results_available (int): The number of media items available for selection.
 
     Returns:
-        MediaItem: The selected media item.
+        MediaItem: The selected media item, or None if no selection is made or an error occurs.
     """
-    # Determine column_info dynamically for (search site)
     if not media_search_manager.media_list:
-        console.print("\n[red]No media items available.")
+        
+        # console.print("\n[red]No media items available.")
         return None
-    
-    # Example of available colors for columns
-    available_colors = ['red', 'magenta', 'yellow', 'cyan', 'green', 'blue', 'white']
-    
-    # Retrieve the keys of the first media item as column headers
-    first_media_item = media_search_manager.media_list[0]
-    column_info = {"Index": {'color': available_colors[0]}}  # Always include Index with a fixed color
-
-    # Assign colors to the remaining keys dynamically
-    color_index = 1
-    for key in first_media_item.__dict__.keys():
-
-        if key.capitalize() in column_to_hide:
-            continue
-
-        if key in ('id', 'type', 'name', 'score'):  # Custom prioritization of colors
-            if key == 'type':
-                column_info["Type"] = {'color': 'yellow'}
-            elif key == 'name':
-                column_info["Name"] = {'color': 'magenta'}
-            elif key == 'score':
-                column_info["Score"] = {'color': 'cyan'}
-
-        else:
-            column_info[key.capitalize()] = {'color': available_colors[color_index % len(available_colors)]}
-            color_index += 1
-
-    table_show_manager.add_column(column_info)
-
-    # Populate the table with title information
-    for i, media in enumerate(media_search_manager.media_list):
-        media_dict = {'Index': str(i)}
 
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+        prompt_message = f"Inserisci il numero del titolo che vuoi selezionare (da 0 a {num_results_available - 1}):"
+        
+        user_input_str = bot.ask(
+            "select_title_from_list_number",
+            prompt_message,
+            None
+        )
+
+        if user_input_str is None: 
+            bot.send_message("Timeout: nessuna selezione ricevuta.", None)
+            return None
+
+        try:
+            chosen_index = int(user_input_str)
+            if 0 <= chosen_index < num_results_available:
+                selected_item = media_search_manager.get(chosen_index)
+                if selected_item:
+                    return selected_item
+                    
+                else:
+                    bot.send_message(f"Errore interno: Impossibile recuperare il titolo con indice {chosen_index}.", None)
+                    return None
+            else:
+                bot.send_message(f"Selezione '{chosen_index}' non valida. Inserisci un numero compreso tra 0 e {num_results_available - 1}.", None)
+                return None
+                
+        except ValueError:
+            bot.send_message(f"Input '{user_input_str}' non valido. Devi inserire un numero.", None)
+            return None
+            
+        except Exception as e:
+            bot.send_message(f"Si è verificato un errore durante la selezione: {e}", None)
+            return None
+
+    else:
+        
+        # Logica originale per la console
+        if not media_search_manager.media_list:
+            console.print("\n[red]No media items available.")
+            return None
+        
+        first_media_item = media_search_manager.media_list[0]
+        column_info = {"Index": {'color': available_colors[0]}}
+
+        color_index = 1
         for key in first_media_item.__dict__.keys():
             if key.capitalize() in column_to_hide:
                 continue
-
-            # Ensure all values are strings for rich add table
-            media_dict[key.capitalize()] = str(getattr(media, key))
-
-        table_show_manager.add_tv_show(media_dict)
-
-    # Run the table and handle user input
-    last_command = table_show_manager.run(force_int_input=True, max_int_input=len(media_search_manager.media_list))
-    table_show_manager.clear()
-
-    # Handle user's quit command
-    if last_command == "q" or last_command == "quit":
-        console.print("\n[red]Quit ...")
-        sys.exit(0)
-
-    # Check if the selected index is within range
-    if 0 <= int(last_command) < len(media_search_manager.media_list):
-        return media_search_manager.get(int(last_command))
-    
-    else:
-        console.print("\n[red]Wrong index")
-        sys.exit(0)
+            if key in ('id', 'type', 'name', 'score'):
+                if key == 'type': column_info["Type"] = {'color': 'yellow'}
+                elif key == 'name': column_info["Name"] = {'color': 'magenta'}
+                elif key == 'score': column_info["Score"] = {'color': 'cyan'}
+            else:
+                column_info[key.capitalize()] = {'color': available_colors[color_index % len(available_colors)]}
+                color_index += 1
+
+        table_show_manager.clear() 
+        table_show_manager.add_column(column_info)
+
+        for i, media in enumerate(media_search_manager.media_list):
+            media_dict = {'Index': str(i)}
+            for key in first_media_item.__dict__.keys():
+                if key.capitalize() in column_to_hide:
+                    continue
+                media_dict[key.capitalize()] = str(getattr(media, key))
+            table_show_manager.add_tv_show(media_dict)
+
+        last_command_str = table_show_manager.run(force_int_input=True, max_int_input=len(media_search_manager.media_list))
+        table_show_manager.clear()
+
+        if last_command_str is None or last_command_str.lower() in ["q", "quit"]: 
+            console.print("\n[red]Selezione annullata o uscita.")
+            return None 
+
+        try:
+           
+            selected_index = int(last_command_str)
+            
+            if 0 <= selected_index < len(media_search_manager.media_list):
+                return media_search_manager.get(selected_index)
+                
+            else:
+                console.print("\n[red]Indice errato o non valido.")
+                # sys.exit(0)
+                return None
+                
+        except ValueError:
+            console.print("\n[red]Input non numerico ricevuto dalla tabella.")
+            # sys.exit(0)
+            return None

StreamingCommunity/Lib/Proxies/proxy.py

@@ -1,20 +1,15 @@
 # 29.04.25
 
-import os
 import sys
 import time
-import json
 import signal
 import warnings
 warnings.filterwarnings("ignore", category=UserWarning)
-from datetime import datetime, timedelta
-from concurrent.futures import ThreadPoolExecutor, as_completed
 
 
 # External library
 import httpx
 from rich import print
-from rich.progress import Progress, SpinnerColumn, BarColumn, TextColumn, TimeRemainingColumn
 
 
 # Internal utilities
@@ -27,118 +22,18 @@ MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
 
 
 class ProxyFinder:
-    def __init__(self, url, timeout_threshold: float = 7.0, max_proxies: int = 150, max_workers: int = 12):
+    def __init__(self, url, timeout_threshold: float = 7.0):
         self.url = url
         self.timeout_threshold = timeout_threshold
-        self.max_proxies = max_proxies
-        self.max_workers = max_workers
-        self.found_proxy = None
         self.shutdown_flag = False
-        self.json_file = os.path.join(os.path.dirname(__file__), 'working_proxies.json')
         signal.signal(signal.SIGINT, self._handle_interrupt)
 
-    def load_saved_proxies(self) -> tuple:
-        """Load saved proxies if they're not expired (2 hours old)"""
-        try:
-            if not os.path.exists(self.json_file):
-                return None, None
-                
-            with open(self.json_file, 'r') as f:
-                data = json.load(f)
-                
-            if not data.get('proxies') or not data.get('last_update'):
-                return None, None
-                
-            last_update = datetime.fromisoformat(data['last_update'])
-            if datetime.now() - last_update > timedelta(hours=2):
-                return None, None
-                
-            return data['proxies'], last_update
-        except Exception:
-            return None, None
-            
-    def save_working_proxy(self, proxy: str, response_time: float):
-        """Save working proxy to JSON file"""
-        data = {
-            'proxies': [{'proxy': proxy, 'response_time': response_time}],
-            'last_update': datetime.now().isoformat()
-        }
-        try:
-            with open(self.json_file, 'w') as f:
-                json.dump(data, f, indent=4)
-        except Exception as e:
-            print(f"[bold red]Error saving proxy:[/bold red] {str(e)}")
-
-    def fetch_geonode(self) -> list:
-        proxies = []
-        try:
-            response = httpx.get(
-                "https://proxylist.geonode.com/api/proxy-list?protocols=http%2Chttps&limit=100&page=1&sort_by=speed&sort_type=asc",
-                headers=get_headers(), 
-                timeout=MAX_TIMEOUT
-            )
-            data = response.json()
-            proxies = [(f"http://{p['ip']}:{p['port']}", "Geonode") for p in data.get('data', [])]
-            
-        except Exception as e:
-            print(f"[bold red]Error in Geonode:[/bold red] {str(e)[:100]}")
-
-        return proxies
-
-    def fetch_proxyscrape(self) -> list:
-        proxies = []
-        try:
-            response = httpx.get(
-                "https://api.proxyscrape.com/v4/free-proxy-list/get?request=get_proxies&protocol=http&skip=0&proxy_format=protocolipport&format=json&limit=100&timeout=1000",
-                headers=get_headers(), 
-                timeout=MAX_TIMEOUT
-            )
-            data = response.json()
-            if 'proxies' in data and isinstance(data['proxies'], list):
-                proxies = [(proxy_data['proxy'], "ProxyScrape") for proxy_data in data['proxies'] if 'proxy' in proxy_data]
-
-        except Exception as e:
-            print(f"[bold red]Error in ProxyScrape:[/bold red] {str(e)[:100]}")
-
-        return proxies
-
-    def fetch_proxies_from_sources(self) -> list:
-        #print("[cyan]Fetching proxies from sources...[/cyan]")
-        with ThreadPoolExecutor(max_workers=3) as executor:
-            proxyscrape_future = executor.submit(self.fetch_proxyscrape)
-            geonode_future = executor.submit(self.fetch_geonode)
-            
-            sources_proxies = {}
-            
-            try:
-                proxyscrape_result = proxyscrape_future.result()
-                sources_proxies["proxyscrape"] = proxyscrape_result[:int(self.max_proxies/2)]
-            except Exception as e:
-                print(f"[bold red]Error fetching from proxyscrape:[/bold red] {str(e)[:100]}")
-                sources_proxies["proxyscrape"] = []
-            
-            try:
-                geonode_result = geonode_future.result()
-                sources_proxies["geonode"] = geonode_result[:int(self.max_proxies/2)]
-            except Exception as e:
-                print(f"[bold red]Error fetching from geonode:[/bold red] {str(e)[:100]}")
-                sources_proxies["geonode"] = []
-            
-            merged_proxies = []
-            
-            if "proxyscrape" in sources_proxies:
-                merged_proxies.extend(sources_proxies["proxyscrape"])
-            
-            if "geonode" in sources_proxies:
-                merged_proxies.extend(sources_proxies["geonode"])
-            
-            proxy_list = merged_proxies[:self.max_proxies]
-            return proxy_list
-
     def _test_single_request(self, proxy_info: tuple) -> tuple:
         proxy, source = proxy_info
         try:
             start = time.time()
+            print(f"[yellow]Testing proxy for URL: {self.url}...")
+
             with httpx.Client(proxy=proxy, timeout=self.timeout_threshold) as client:
                 response = client.get(self.url, headers=get_headers())
                 if response.status_code == 200:
@@ -161,72 +56,17 @@ class ProxyFinder:
         return (proxy, success2 and time2 <= self.timeout_threshold, avg_time, text1, source)
 
     def _handle_interrupt(self, sig, frame):
-        print("\n[bold yellow]Received keyboard interrupt. Terminating...[/bold yellow]")
+        print("\n[red]Received keyboard interrupt. Terminating...")
         self.shutdown_flag = True
         sys.exit(0)
 
-    def find_fast_proxy(self) -> tuple:
-        saved_proxies, last_update = self.load_saved_proxies()
-        if saved_proxies:
-            print("[cyan]Testing saved proxy...[/cyan]")
-            for proxy_data in saved_proxies:
-                result = self.test_proxy((proxy_data['proxy'], 'cached'))
-                if result[1]:
-                    return proxy_data['proxy'], result[3], result[2]
-                else:
-                    print(f"[red]Saved proxy {proxy_data['proxy']} failed - response time: {result[2]:.2f}s[/red]")
-
-        proxies = self.fetch_proxies_from_sources()
-        if not proxies:
-            print("[bold red]No proxies fetched to test.[/bold red]")
-            return (None, None, None)
-             
-        found_proxy = None
-        response_text = None
-        source = None
-        failed_count = 0
-        success_count = 0
-
-        #print(f"[cyan]Testing {len(proxies)} proxies...[/cyan]")
-        with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
-            futures = {executor.submit(self.test_proxy, p): p for p in proxies}
-            with Progress(
-                SpinnerColumn(),
-                TextColumn("[progress.description]{task.description}"),
-                BarColumn(),
-                TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
-                TextColumn("[cyan]{task.fields[success]}[/cyan]/[red]{task.fields[failed]}[/red]"),
-                TimeRemainingColumn(),
-            ) as progress:
-                task = progress.add_task(
-                    "[cyan]Testing Proxies", 
-                    total=len(futures),
-                    success=success_count,
-                    failed=failed_count
-                )
-                
-                for future in as_completed(futures):
-                    if self.shutdown_flag:
-                        break
-
-                    try:
-                        proxy, success, elapsed, response, proxy_source = future.result()
-                        if success:
-                            success_count += 1
-                            print(f"[bold green]Found valid proxy:[/bold green] {proxy} ({elapsed:.2f}s)")
-                            found_proxy = proxy
-                            response_text = response
-                            self.save_working_proxy(proxy, elapsed)
-                            self.shutdown_flag = True
-                            break
-                        else:
-                            failed_count += 1
-                    except Exception:
-                        failed_count += 1
-                    
-                    progress.update(task, advance=1, success=success_count, failed=failed_count)
-
-        if not found_proxy:
-            print("[bold red]No working proxies found[/bold red]")
-        
-        return (found_proxy, response_text, source)
+    def find_fast_proxy(self) -> str:
+        try:
+            proxy_config = config_manager.get("REQUESTS", "proxy")
+            if proxy_config and isinstance(proxy_config, dict) and 'http' in proxy_config:
+                print("[cyan]Using configured proxy from config.json...[/cyan]")
+                return proxy_config['http']
+        except Exception as e:
+            print(f"[red]Error getting configured proxy: {str(e)}[/red]")
+            
+        return None

StreamingCommunity/TelegramHelp/config.json

@@ -0,0 +1,62 @@
+{
+    "DEFAULT": {
+        "debug": false,
+        "show_message": true,
+        "clean_console": true,
+        "show_trending": true,
+        "use_api": true,
+        "not_close": false,
+        "telegram_bot": true,
+        "download_site_data": true,
+        "validate_github_config": true
+    },
+    "OUT_FOLDER": {
+        "root_path": "/mnt/data/media/",
+        "movie_folder_name": "films",
+        "serie_folder_name": "serie_tv",
+        "anime_folder_name": "Anime",
+        "map_episode_name": "E%(episode)_%(episode_name)",
+        "add_siteName": false
+    },
+    "QBIT_CONFIG": {
+        "host": "192.168.1.51",
+        "port": "6666",
+        "user": "admin",
+        "pass": "adminadmin"
+    },
+    "M3U8_DOWNLOAD": {
+        "tqdm_delay": 0.01,
+        "default_video_workser": 12,
+        "default_audio_workser": 12,
+        "segment_timeout": 8,
+        "download_audio": true,
+        "merge_audio": true,
+        "specific_list_audio": [
+            "ita"
+        ],
+        "download_subtitle": true,
+        "merge_subs": true,
+        "specific_list_subtitles": [
+            "ita",
+            "eng"
+        ],
+        "cleanup_tmp_folder": true
+    },
+    "M3U8_CONVERSION": {
+        "use_codec": false,
+        "use_vcodec": true,
+        "use_acodec": true,
+        "use_bitrate": true,
+        "use_gpu": false,
+        "default_preset": "ultrafast"
+    },
+    "M3U8_PARSER": {
+        "force_resolution": "Best",
+        "get_only_link": false
+    },
+    "REQUESTS": {
+        "verify": false,
+        "timeout": 20,
+        "max_retry": 8
+    }
+}

StreamingCommunity/TelegramHelp/telegram_bot.py

@@ -575,6 +575,10 @@ class TelegramBot:
             cleaned_output = cleaned_output.replace(
                 "\n\n", "\n"
             )  # Rimuovi newline multipli
+                    
+            # Inizializza le variabili
+            cleaned_output_0 = None  # o ""
+            cleaned_output_1 = None  # o ""
 
             # Dentro cleaned_output c'è una stringa recupero quello che si trova tra ## ##
             download_section = re.search(r"##(.*?)##", cleaned_output, re.DOTALL)

StreamingCommunity/Upload/version.py

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

StreamingCommunity/Util/config_json.py

@@ -39,9 +39,6 @@ class ConfigManager:
           
             # Get the actual path of the module file
             current_file_path = os.path.abspath(__file__)
-            # Navigate upwards to find the project root
-            # Assuming this file is in a package structure like StreamingCommunity/Util/config_json.py
-            # We need to go up 2 levels to reach the project root
             base_path = os.path.dirname(os.path.dirname(os.path.dirname(current_file_path)))
             
         # Initialize file paths
@@ -562,7 +559,6 @@ class ConfigManager:
         return section in config_source
 
 
-# Helper function to check the platform
 def get_use_large_bar():
     """
     Determine if the large bar feature should be enabled.

StreamingCommunity/Util/os.py

@@ -296,12 +296,6 @@ class InternManager():
             "Google": ["8.8.8.8", "8.8.4.4"],
             "OpenDNS": ["208.67.222.222", "208.67.220.220"],
             "Quad9": ["9.9.9.9", "149.112.112.112"],
-            "AdGuard": ["94.140.14.14", "94.140.15.15"],
-            "Comodo": ["8.26.56.26", "8.20.247.20"],
-            "Level3": ["209.244.0.3", "209.244.0.4"],
-            "Norton": ["199.85.126.10", "199.85.127.10"],
-            "CleanBrowsing": ["185.228.168.9", "185.228.169.9"],
-            "Yandex": ["77.88.8.8", "77.88.8.1"]
         }
         
         try:

StreamingCommunity/run.py

@@ -219,8 +219,8 @@ def main(script_id = 0):
         console.print("[blue]• Quad9 (9.9.9.9) 'https://docs.quad9.net/Setup_Guides/Windows/Windows_10/'")
         console.print("\n[yellow]⚠️ The program will not work until you configure your DNS settings.")
 
-        time.sleep(1)        
-        msg.ask("[yellow]Press Enter to exit...")
+        time.sleep(2)        
+        msg.ask("[yellow]Press Enter to continue ...")
 
     # Load search functions
     search_functions = load_search_functions()

{streamingcommunity-3.0.6.dist-info → streamingcommunity-3.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.6
+Version: 3.0.8
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -35,7 +35,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 
 <p align="center">
-  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="600"/>
+  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="450"/>
 </p>
 
 <p align="center">
@@ -506,7 +506,11 @@ To enable qBittorrent integration, follow the setup guide [here](https://github.
     "REQUESTS": {
         "verify": false,
         "timeout": 20,
-        "max_retry": 8
+        "max_retry": 8,
+        "proxy": {
+            "http": "http://username:password@host:port",
+            "https": "https://username:password@host:port"
+        }
     }
 }
 ```
@@ -514,6 +518,22 @@ To enable qBittorrent integration, follow the setup guide [here](https://github.
 - `verify`: Verifies SSL certificates
 - `timeout`: Maximum timeout (in seconds) for each request
 - `max_retry`: Number of retry attempts per segment during M3U8 index download
+- `proxy`: Proxy configuration for HTTP/HTTPS requests
+  * Set to empty string `""` to disable proxies (default)
+  * Example with authentication:
+    ```json
+    "proxy": {
+        "http": "http://username:password@host:port",
+        "https": "https://username:password@host:port"
+    }
+    ```
+  * Example without authentication:
+    ```json
+    "proxy": {
+        "http": "http://host:port",
+        "https": "https://host:port"
+    }
+    ```
 </details>
 
 <details>
@@ -764,26 +784,24 @@ The `run-container` command mounts also the `config.json` file, so any change to
 The bot was created to replace terminal commands and allow interaction via Telegram. Each download runs within a screen session, enabling multiple downloads to run simultaneously.
 
 To run the bot in the background, simply start it inside a screen session and then press Ctrl + A, followed by D, to detach from the session without stopping the bot.
-</details>
-
-<details>
-<summary>🤖 Bot Commands</summary>
 
 Command Functions:
 
 🔹 /start – Starts a new search for a download. This command performs the same operations as manually running the script in the terminal with test_run.py.
 
 🔹 /list – Displays the status of active downloads, with options to:
-- Stop an incorrect download using /stop <ID>
-- View the real-time output of a download using /screen <ID>
+
+Stop an incorrect download using /stop <ID>.
+
+View the real-time output of a download using /screen <ID>.
 
 ⚠ Warning: If a download is interrupted, incomplete files may remain in the folder specified in config.json. These files must be deleted manually to avoid storage or management issues.
-</details>
 
-<details>
-<summary>🔧 Environment Setup</summary>
+🛠 Configuration: Currently, the bot's settings are stored in the config.json file, which is located in the same directory as the telegram_bot.py script.
+
+## .env Example:
 
-Create an `.env` file with:
+You need to create an .env file and enter your Telegram token and user ID to authorize only one user to use it
 
 ```
 TOKEN_TELEGRAM=IlTuo2131TOKEN$12D3Telegram