StreamingCommunity 3.3.7__py3-none-any.whl → 3.3.9__py3-none-any.whl

StreamingCommunity/Api/Template/loader.py

@@ -105,10 +105,17 @@ def load_search_functions() -> Dict[str, LazySearchModule]:
     loaded_functions = {}
     
     # Determine base path (calculated once)
-    base_path = os.path.join(
-        sys._MEIPASS, "StreamingCommunity"
-    ) if getattr(sys, 'frozen', False) else os.path.dirname(os.path.dirname(__file__))
-    api_dir = os.path.join(base_path, 'Site')
+    if getattr(sys, 'frozen', False):
+
+        # When frozen (exe), sys._MEIPASS points to temporary extraction directory
+        base_path = os.path.join(sys._MEIPASS, "StreamingCommunity")
+        api_dir = os.path.join(base_path, 'Api', 'Site')
+        
+    else:
+        # When not frozen, __file__ is in StreamingCommunity/Api/Template/loader.py
+        # Go up two levels to get to StreamingCommunity/Api
+        base_path = os.path.dirname(os.path.dirname(__file__))
+        api_dir = os.path.join(base_path, 'Site')
     
     # Quick scan: just read directory structure and module metadata
     modules_metadata = []
@@ -138,6 +145,7 @@ def load_search_functions() -> Dict[str, LazySearchModule]:
             
             if indice is not None:
                 modules_metadata.append((module_name, indice))
+                logging.info(f"Found module: {module_name} (index: {indice})")
                 
         except Exception as e:
             console.print(f"[yellow]Warning: Could not read metadata from {module_name}: {str(e)}")
@@ -146,4 +154,5 @@ def load_search_functions() -> Dict[str, LazySearchModule]:
     for module_name, indice in sorted(modules_metadata, key=lambda x: x[1]):
         loaded_functions[f'{module_name}_search'] = LazySearchModule(module_name, indice)
     
+    logging.info(f"Loaded {len(loaded_functions)} search modules")
     return loaded_functions

StreamingCommunity/Lib/Downloader/DASH/cdm_helpher.py

@@ -5,7 +5,7 @@ import logging
 
 
 # External libraries
-import httpx
+from curl_cffi import requests
 from rich.console import Console
 from pywidevine.cdm import Cdm
 from pywidevine.device import Device
@@ -39,8 +39,13 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
             req_headers = headers or {}
             req_headers['Content-Type'] = 'application/octet-stream'
 
-            # Send license request
-            response = httpx.post(license_url, data=challenge, headers=req_headers, content=payload)
+            # Send license request using curl_cffi
+            try:
+                # response = httpx.post(license_url, data=challenge, headers=req_headers, content=payload)
+                response = requests.post(license_url, data=challenge, headers=req_headers, json=payload, impersonate="chrome124")
+            except Exception as e:
+                console.print(f"[bold red]Request error:[/bold red] {e}")
+                return None
 
             if response.status_code != 200:
                 console.print(f"[bold red]License error:[/bold red] {response.status_code}, {response.text}")

StreamingCommunity/Lib/Downloader/DASH/decrypt.py

@@ -16,6 +16,7 @@ from StreamingCommunity.Util.os import get_mp4decrypt_path
 console = Console()
 
 
+# NOTE!: SAREBBE MEGLIO FARLO PER OGNI FILE DURANTE IL DOWNLOAD ... MA PER ORA LO LASCIO COSI
 def decrypt_with_mp4decrypt(encrypted_path, kid, key, output_path=None, cleanup=True):
     """
     Decrypt an mp4/m4s file using mp4decrypt.

StreamingCommunity/Lib/Downloader/DASH/downloader.py

@@ -13,7 +13,7 @@ from rich.table import Table
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.os import internet_manager
+from StreamingCommunity.Util.os import os_manager, internet_manager
 from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.headers import get_userAgent
 
@@ -59,10 +59,17 @@ class DASH_Downloader:
         self.license_url = license_url
         self.mpd_url = mpd_url
         self.mpd_sub_list = mpd_sub_list or []
-        self.out_path = os.path.splitext(os.path.abspath(str(output_path)))[0]
+        self.out_path = os.path.splitext(os.path.abspath(os_manager.get_sanitize_path(output_path)))[0]
         self.original_output_path = output_path
         self.file_already_exists = os.path.exists(self.original_output_path)
         self.parser = None
+
+        # Added defaults to avoid AttributeError when no subtitles/audio/video are present
+        # Non la soluzione migliore ma evita crash in assenza di audio/video/subs
+        self.selected_subs = []
+        self.selected_video = None
+        self.selected_audio = None
+
         self._setup_temp_dirs()
 
         self.error = None