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

StreamingCommunity/Api/Site/1337xx/__init__.py

@@ -21,9 +21,10 @@ from .title import download_title
 
 # Variable
 indice = 3
-_useFor = "film_serie"
+_useFor = "Torrent"
 _priority = 0
-_engineDownload = "tor"
+_engineDownload = "Torrent"
+_deprecate = False
 
 console = Console()
 msg = Prompt()

StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -24,9 +24,10 @@ from .series import download_series
 
 # Variable
 indice = 2
-_useFor = "film_serie"
+_useFor = "Film_&_Serie"
 _priority = 0
 _engineDownload = "hls"
+_deprecate = True
 
 msg = Prompt()
 console = Console()

StreamingCommunity/Api/Site/animeunity/__init__.py

@@ -24,9 +24,10 @@ from .serie import download_series
 
 # Variable
 indice = 1
-_useFor = "anime"
+_useFor = "Anime"
 _priority = 0
 _engineDownload = "mp4"
+_deprecate = False
 
 msg = Prompt()
 console = Console()

StreamingCommunity/Api/Site/animeworld/__init__.py

@@ -18,10 +18,11 @@ from .film import download_film
 
 
 # Variable
-indice = 8
-_useFor = "anime"
+indice = 6
+_useFor = "Anime"
 _priority = 0
 _engineDownload = "mp4"
+_deprecate = False
 
 msg = Prompt()
 console = Console()

StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -20,10 +20,11 @@ from .series import download_series
 
 
 # Variable
-indice = 5
-_useFor = "serie"
+indice = 4
+_useFor = "Serie"
 _priority = 0
 _engineDownload = "hls"
+_deprecate = False
 
 msg = Prompt()
 console = Console()

StreamingCommunity/Api/Site/raiplay/__init__.py

@@ -19,10 +19,11 @@ from .film import download_film
 
 
 # Variable
-indice = 8
-_useFor = "film_serie"
+indice = 5
+_useFor = "Film_&_Serie"
 _priority = 1                # NOTE: Site search need the use of tmbd obj
 _engineDownload = "hls"
+_deprecate = False
 
 msg = Prompt()
 console = Console()

StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -25,9 +25,10 @@ from .series import download_series
 
 # Variable
 indice = 0
-_useFor = "film_serie"
+_useFor = "Film_&_Serie"
 _priority = 0
 _engineDownload = "hls"
+_deprecate = False
 
 msg = Prompt()
 console = Console()
@@ -96,7 +97,21 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
         return
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
+        if site_constant.TELEGRAM_BOT:
+            bot = get_bot_instance()
+            string_to_search = bot.ask(
+                "key_search",
+                f"Enter the search term\nor type 'back' to return to the menu: ",
+                None
+            )
+
+            if string_to_search == 'back':
+
+                # Restart the script
+                subprocess.Popen([sys.executable] + sys.argv)
+                sys.exit()
+        else:
+            string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
 
     # Search on database
     len_database = title_search(string_to_search)

StreamingCommunity/Api/Site/streamingcommunity/film.py

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

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -154,8 +154,8 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     start_message()
 
     # Init class
-    video_source = VideoSource(site_constant.FULL_URL, True, select_season.id)
-    scrape_serie = GetSerieInfo(site_constant.FULL_URL, select_season.id, select_season.slug)
+    video_source = VideoSource(f"{site_constant.FULL_URL}/it", True, select_season.id)
+    scrape_serie = GetSerieInfo(f"{site_constant.FULL_URL}/it", select_season.id, select_season.slug)
 
     # Collect information about season
     scrape_serie.getNumberSeason()

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -1,8 +1,11 @@
 # 10.12.23
 
+import json
+
 
 # External libraries
 import httpx
+from bs4 import BeautifulSoup
 from rich.console import Console
 
 
@@ -41,16 +44,34 @@ def title_search(query: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    search_url = f"{site_constant.FULL_URL}/api/search?q={query}"
+    try:
+        response = httpx.get(
+            f"{site_constant.FULL_URL}/it", 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout
+        )
+        response.raise_for_status()
+
+        soup = BeautifulSoup(response.text, 'html.parser')
+        version = json.loads(soup.find('div', {'id': "app"}).get("data-page"))['version']
+
+    except Exception as e:
+        console.print(f"[red]Site: {site_constant.SITE_NAME} version, request error: {e}")
+        return 0
+
+    search_url = f"{site_constant.FULL_URL}/it/search?q={query}"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
         response = httpx.get(
             search_url, 
-            headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout, 
-            follow_redirects=True, 
-            verify=False
+            headers = {
+                'referer': site_constant.FULL_URL,
+                'user-agent': get_userAgent(),
+                'x-inertia': 'true',
+                'x-inertia-version': version
+            },
+            timeout=max_timeout
         )
         response.raise_for_status()
 
@@ -66,7 +87,7 @@ def title_search(query: str) -> int:
 
     # Collect json data
     try:
-        data = response.json().get('data', [])
+        data = response.json().get('props').get('titles')
     except Exception as e:
         console.log(f"Error parsing JSON response: {e}")
         return 0

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

@@ -96,17 +96,16 @@ class GetSerieInfo:
             if not season:
                 logging.error(f"Season {number_season} not found")
                 return
-    
+            
             response = httpx.get(
-                url=f'{self.url}/titles/{self.media_id}-{self.series_name}/stagione-{number_season}', 
+                url=f'{self.url}/titles/{self.media_id}-{self.series_name}/season-{number_season}', 
                 headers={
-                    'User-Agent': get_userAgent(),
-                    'x-inertia': 'true', 
+                    'User-Agent': self.headers['user-agent'],
+                    'x-inertia': 'true',
                     'x-inertia-version': self.version,
                 },
                 timeout=max_timeout
             )
-            response.raise_for_status()
 
             # Extract episodes from JSON response
             json_response = response.json().get('props', {}).get('loadedSeason', {}).get('episodes', [])

StreamingCommunity/Api/Site/streamingwatch/__init__.py

@@ -19,10 +19,11 @@ from .series import download_series
 
 
 # Variable
-indice = 8
-_useFor = "film_serie"
+indice = 7
+_useFor = "Film_&_Serie"
 _priority = 10          # !!! MOLTO LENTO
 _engineDownload = "hls"
+_deprecate = False
 
 msg = Prompt()
 console = Console()

StreamingCommunity/Upload/version.py

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

StreamingCommunity/Util/config_json.py

@@ -36,8 +36,13 @@ class ConfigManager:
             base_path = os.path.dirname(sys.executable)
 
         else:
-            # Use the current directory where the script is executed
-            base_path = os.getcwd()
+          
+            # 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
         self.file_path = os.path.join(base_path, file_name)
@@ -166,7 +171,6 @@ class ConfigManager:
                 raise Exception(f"Error downloading reference configuration. Code: {response.status_code}")
             
             reference_config = response.json()
-            console.print(f"[bold cyan]Reference configuration downloaded:[/bold cyan] [green]{len(reference_config)} keys available[/green]")
             
             # Compare and update missing keys
             merged_config = self._deep_merge_configs(self.config, reference_config)
@@ -285,7 +289,6 @@ class ConfigManager:
                     self.configSite = data[0]['data']
                     
                     site_count = len(self.configSite) if isinstance(self.configSite, dict) else 0
-                    console.print(f"[bold green]Site data retrieved:[/bold green] {site_count} streaming services available")
                     
                 else:
                     console.print("[bold yellow]API returned an empty data set[/bold yellow]")

StreamingCommunity/global_search.py

@@ -61,7 +61,8 @@ def load_search_functions():
             priority = getattr(mod, '_priority', 0)
 
             if priority == 0:
-                modules.append((module_name, indice, use_for))
+                if not getattr(mod, '_deprecate'):
+                    modules.append((module_name, indice, use_for))
 
         except Exception as e:
             console.print(f"[red]Failed to import module {module_name}: {str(e)}")

StreamingCommunity/run.py

@@ -30,7 +30,7 @@ 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')
+NOT_CLOSE_CONSOLE = config_manager.get_bool('DEFAULT', 'not_close')
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
 
 
@@ -61,7 +61,7 @@ def load_search_functions():
     loaded_functions = {}
 
     # Lista dei siti da escludere se TELEGRAM_BOT è attivo
-    excluded_sites = {"cb01new", "ddlstreamitaly", "guardaserie", "ilcorsaronero", "mostraguarda"} if TELEGRAM_BOT else set()
+    excluded_sites = {"cb01new", "guardaserie", "ilcorsaronero", "mostraguarda"} if TELEGRAM_BOT else set()
 
     # Find api home directory
     if getattr(sys, 'frozen', False):  # Modalità PyInstaller
@@ -89,9 +89,11 @@ def load_search_functions():
             mod = importlib.import_module(f'StreamingCommunity.Api.Site.{module_name}')
 
             # Get 'indice' from the module
-            indice = getattr(mod, 'indice', 0)
-            use_for = getattr(mod, '_useFor', 'other')
-            modules.append((module_name, indice, use_for))
+            indice = getattr(mod, 'indice')
+            use_for = getattr(mod, '_useFor')
+
+            if not getattr(mod, '_deprecate'):
+                modules.append((module_name, indice, use_for))
 
         except Exception as e:
             console.print(f"[red]Failed to import module {module_name}: {str(e)}")
@@ -191,6 +193,13 @@ def force_exit():
 
 def main(script_id = 0):
 
+    color_map = {
+        "anime": "red",
+        "film_&_serie": "yellow",
+        "serie": "blue",
+        "torrent": "white"
+    }
+
     if TELEGRAM_BOT:
         bot = get_bot_instance()
         bot.send_message(f"Avviato script {script_id}", None)
@@ -202,13 +211,16 @@ def main(script_id = 0):
     initialize()
     
     if not internet_manager.check_dns_provider():
+        print()
         console.print("[red]❌ ERROR: DNS configuration is required!")
         console.print("[red]The program cannot function correctly without proper DNS settings.")
         console.print("[yellow]Please configure one of these DNS servers:")
-        console.print("[blue]• Cloudflare (1.1.1.1)")
-        console.print("[blue]• Quad9 (9.9.9.9)")
+        console.print("[blue]• Cloudflare (1.1.1.1) 'https://developers.cloudflare.com/1.1.1.1/setup/windows/'")
+        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.")
-        input("[yellow]Press Enter to exit...")
+
+        time.sleep(1)        
+        msg.ask("[yellow]Press Enter to exit...")
 
     # Load search functions
     search_functions = load_search_functions()
@@ -251,30 +263,6 @@ def main(script_id = 0):
     )
 
     # Add arguments for search functions
-    color_map = {
-        "anime": "red",
-        "film_serie": "yellow",
-        "film": "blue",
-        "serie": "green",
-        "other": "white"
-    }
-
-    # Add dynamic arguments based on loaded search modules
-    used_short_options = set()
-
-    for alias, (_, use_for) in search_functions.items():
-        short_option = alias[:3].upper()
-    
-        original_short_option = short_option
-        count = 1
-        while short_option in used_short_options:
-            short_option = f"{original_short_option}{count}"
-            count += 1
-    
-        used_short_options.add(short_option)
-        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
@@ -309,54 +297,45 @@ def main(script_id = 0):
         global_search(search_terms)
         return
 
-    # Map command-line arguments to functions
-    arg_to_function = {alias: func for alias, (func, _) in search_functions.items()}
-
-    # 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, search_terms=search_terms)
-            return
-
-    # Mapping user input to functions
-    input_to_function = {str(i): func for i, (alias, (func, _)) in enumerate(search_functions.items())}
-
-    # Create dynamic prompt message and choices
-    choice_labels = {str(i): (alias.split("_")[0].capitalize(), use_for) for i, (alias, (_, use_for)) in enumerate(search_functions.items())}
-
-    # Add global search option to the menu
-    #global_search_key = str(len(choice_labels))
-    #choice_labels[global_search_key] = ("Global Search", "all")
-    #input_to_function[global_search_key] = global_search
+    # Create mappings using module indice
+    input_to_function = {}
+    choice_labels = {}
+    
+    for alias, (func, use_for) in search_functions.items():
+        module_name = alias.split("_")[0]
+        try:
+            mod = importlib.import_module(f'StreamingCommunity.Api.Site.{module_name}')
+            site_index = str(getattr(mod, 'indice'))
+            input_to_function[site_index] = func
+            choice_labels[site_index] = (module_name.capitalize(), use_for.lower())
+        except Exception as e:
+            console.print(f"[red]Error mapping module {module_name}: {str(e)}")
 
-    # Display the category legend in a single line
+    # Display the category legend
     legend_text = " | ".join([f"[{color}]{category.capitalize()}[/{color}]" for category, color in color_map.items()])
     console.print(f"\n[bold green]Category Legend:[/bold green] {legend_text}")
 
-    # Construct the prompt message with color-coded site names
+    # Construct prompt with proper color mapping
     prompt_message = "[green]Insert category [white](" + ", ".join(
-        [f"{key}: [{color_map.get(label[1], 'white')}]{label[0]}[/{color_map.get(label[1], 'white')}]" for key, label in choice_labels.items()]
+        [f"[{color_map.get(label[1], 'white')}]{key}: {label[0]}[/{color_map.get(label[1], 'white')}]" 
+         for key, label in choice_labels.items()]
     ) + "[white])"
 
     if TELEGRAM_BOT:
-        
-        # Display the category legend in a single line
         category_legend_str = "Categorie: \n" + " | ".join([
             f"{category.capitalize()}" for category in color_map.keys()
         ])
 
-        # Costruisci il messaggio senza emoji
         prompt_message = "Inserisci il sito:\n" + "\n".join(
             [f"{key}: {label[0]}" for key, label in choice_labels.items()]
         )
 
         console.print(f"\n{prompt_message}")
 
-        # Chiedi la scelta all'utente con il bot Telegram
         category = bot.ask(
             "select_provider",
             f"{category_legend_str}\n\n{prompt_message}",
-            None  # Passiamo la lista delle chiavi come scelte
+            None
         )
 
     else:
@@ -364,13 +343,6 @@ def main(script_id = 0):
 
     # Run the corresponding function based on user input
     if category in input_to_function:
-        """if category == global_search_key:
-            # Run global search
-            run_function(input_to_function[category], search_terms=search_terms)
-        
-        else:"""
-        
-        # Run normal site-specific search
         run_function(input_to_function[category], search_terms=search_terms)
         
     else:
@@ -379,10 +351,11 @@ def main(script_id = 0):
 
         console.print("[red]Invalid category.")
 
-        if CLOSE_CONSOLE:
-            restart_script()  # Riavvia lo script invece di uscire
+        if NOT_CLOSE_CONSOLE:
+            restart_script()
+
         else:
-            force_exit()  # Usa la funzione per chiudere sempre
+            force_exit()
 
             if TELEGRAM_BOT:
                 bot.send_message(f"Chiusura in corso", None)
@@ -390,4 +363,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)