Some fix

Author: Arrowar

.github/workflows/testing.yml

@@ -64,4 +64,4 @@ jobs:
         python -m pip install ruff
     - name: Run Ruff check
       run: |
-        ruff check . --fix --exclude Test --exclude .github
+        ruff check . --fix --exclude Test --exclude GUI

GUI/manage.py

@@ -2,9 +2,16 @@
 import os
 import sys
 
+# Fix PYTHONPATH
+current_dir = os.path.dirname(os.path.abspath(__file__))
+parent_dir = os.path.dirname(current_dir)
+if parent_dir not in sys.path:
+    sys.path.insert(0, parent_dir)
+
 from StreamingCommunity.Util.os import os_summary
 
 
+
 def main():
     os_summary.init()
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "webgui.settings")
@@ -14,4 +21,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

StreamingCommunity/Api/Site/mediasetinfinity/util/get_license.py

@@ -9,7 +9,12 @@
 # External library
 import httpx
 from rich.console import Console
-from seleniumbase import Driver
+try:
+    from seleniumbase import Driver
+    SELENIUMBASE_AVAILABLE = True
+except ImportError:
+    SELENIUMBASE_AVAILABLE = False
+    Driver = None
 
 
 # Internal utilities
@@ -40,6 +45,17 @@ def save_network_data(data):
 
 
 def generate_betoken(username: str, password: str, sleep_action: float = 1.0) -> str:
+    """Generate beToken using browser automation"""
+    
+    if not SELENIUMBASE_AVAILABLE:
+        console.print("[red]Error: seleniumbase is not installed. Cannot perform browser login.")
+        console.print("[yellow]Install seleniumbase with: pip install seleniumbase")
+        return None
+    
+    if not Driver:
+        console.print("[red]Error: seleniumbase Driver is not available.")
+        return None
+    
     driver = Driver(uc=True, uc_cdp_events=True, incognito=True, headless=True)
 
     try:
@@ -155,6 +171,7 @@ def generate_betoken(username: str, password: str, sleep_action: float = 1.0) ->
     finally:
         driver.quit()
 
+
 def get_bearer_token():
     """
     Gets the BEARER_TOKEN for authentication.
@@ -173,6 +190,11 @@ def get_bearer_token():
     password = config_manager.get_dict("SITE_LOGIN", "mediasetinfinity").get("password", "")
 
     if username and password:
+        if not SELENIUMBASE_AVAILABLE:
+            console.print("[yellow]Warning: seleniumbase not available. Cannot perform automatic login.")
+            console.print("[yellow]Please manually obtain beToken and set it in config.")
+            return config_manager.get_dict("SITE_LOGIN", "mediasetinfinity")["beToken"]
+        
         beToken = generate_betoken(username, password)
 
         if beToken is not None:
@@ -187,6 +209,7 @@ def get_bearer_token():
 
     return config_manager.get_dict("SITE_LOGIN", "mediasetinfinity")["beToken"]
 
+
 def get_playback_url(BEARER_TOKEN, CONTENT_ID):
     """
     Gets the playback URL for the specified content.
@@ -231,6 +254,7 @@ def get_playback_url(BEARER_TOKEN, CONTENT_ID):
     except Exception as e:
         raise RuntimeError(f"Failed to get playback URL: {e}")
 
+
 def parse_tracking_data(tracking_value):
     """
     Parses the trackingData string into a dictionary.
@@ -243,6 +267,7 @@ def parse_tracking_data(tracking_value):
     """
     return dict(item.split('=', 1) for item in tracking_value.split('|') if '=' in item)
 
+
 def parse_smil_for_tracking_and_video(smil_xml):
     """
     Extracts all video_src and trackingData pairs from the SMIL.
@@ -283,6 +308,7 @@ def parse_smil_for_tracking_and_video(smil_xml):
 
     return results
 
+
 def get_tracking_info(BEARER_TOKEN, PLAYBACK_JSON):
     """
     Retrieves tracking information from the playback JSON.
@@ -326,6 +352,7 @@ def get_tracking_info(BEARER_TOKEN, PLAYBACK_JSON):
     except Exception:
         return None
 
+
 def generate_license_url(BEARER_TOKEN, tracking_info):
     """
     Generates the URL to obtain the Widevine license.

StreamingCommunity/Lib/Downloader/DASH/cdm_helpher.py

@@ -29,29 +29,11 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
     Returns:
         list: List of dicts {'kid': ..., 'key': ...} (only CONTENT keys) or None if error.
     """
-
-    # Check if PSSH is a valid base64 string
-    try:
-        base64.b64decode(pssh)
-    except Exception:
-        console.print("[bold red] Invalid PSSH base64 string.[/bold red]")
-        return None
-
     try:
         device = Device.load(cdm_device_path)
         cdm = Cdm.from_device(device)
         session_id = cdm.open()
 
-        # Display security level in a more readable format
-        security_levels = {1: "L1 (Hardware)", 2: "L2 (Software)", 3: "L3 (Software)"}
-        security_level_str = security_levels.get(device.security_level, 'Unknown')
-        logging.info(f"Security Level: {security_level_str}")
-
-        # Only allow L3, otherwise warn and exit
-        if device.security_level != 3:
-            console.print(f"[bold yellow]⚠️ Only L3 (Software) security level is supported. Current: {security_level_str}[/bold yellow]")
-            return None
-
         try:
             challenge = cdm.get_license_challenge(session_id, PSSH(pssh))
             req_headers = headers or {}
@@ -108,6 +90,7 @@ def get_widevine_keys(pssh, license_url, cdm_device_path, headers=None, payload=
             content_keys = []
             for key in cdm.get_keys(session_id):
                 if key.type == "CONTENT":
+                    
                     kid = key.kid.hex() if isinstance(key.kid, bytes) else str(key.kid)
                     key_val = key.key.hex() if isinstance(key.key, bytes) else str(key.key)
 

StreamingCommunity/Lib/M3U8/decryptor.py

@@ -78,18 +78,4 @@ def decrypt(self, ciphertext: bytes) -> bytes:
         else:
             raise ValueError("Invalid or unsupported method")
 
-        """
-        end = time.perf_counter_ns()
-
-        # Calculate the elapsed time with high precision
-        elapsed_nanoseconds = end - start
-        elapsed_milliseconds = elapsed_nanoseconds / 1_000_000
-        elapsed_seconds = elapsed_nanoseconds / 1_000_000_000
-
-        # Log performance metrics
-        logging.info("[Crypto Decryption Performance]")
-        logging.info(f"Method: {self.method}")
-        logging.info(f"Decryption Time: {elapsed_milliseconds:.4f} ms ({elapsed_seconds:.6f} s)")
-        logging.info(f"Decrypted Content Length: {len(decrypted_content)} bytes")
-        """
         return decrypted_content

StreamingCommunity/Lib/TMBD/tmdb.py

@@ -1,7 +1,6 @@
 # 24.08.24
 
 import sys
-from typing import Dict
 
 
 # External libraries
@@ -95,7 +94,6 @@ def __init__(self, api_key):
         """
         self.api_key = api_key
         self.base_url = "https://api.themoviedb.org/3"
-        #self.genres = self._fetch_genres()
         self._cached_trending_tv = None
         self._cached_trending_movies = None
 
@@ -120,16 +118,6 @@ def _make_request(self, endpoint, params=None):
 
         return response.json()
 
-    def _fetch_genres(self) -> Dict[int, str]:
-        """
-        Fetch and return the genre names from TheMovieDB.
-
-        Returns:
-            Dict[int, str]: A dictionary mapping genre IDs to genre names.
-        """
-        genres = self._make_request("genre/movie/list")
-        return {genre['id']: genre['name'] for genre in genres.get('genres', [])}
-
     def _display_top_5(self, category: str, data, name_key='title'):
         """
         Display top 5 most popular items in a single line with colors.

StreamingCommunity/Util/color.py

@@ -1,7 +1,5 @@
 # 24.05.24
 
-import struct
-
 class Colors:
     BLACK = "\033[30m"
     RED = "\033[31m"
@@ -19,22 +17,4 @@ class Colors:
     LIGHT_MAGENTA = "\033[95m"
     LIGHT_CYAN = "\033[96m"
     WHITE = "\033[97m"
-    RESET = "\033[0m"
-
-
-def extract_png_chunk(png_with_wvd, out_wvd_path):
-    with open(png_with_wvd, "rb") as f: data = f.read()
-    pos = 8
-    while pos < len(data):
-        length = struct.unpack(">I", data[pos:pos+4])[0]
-        chunk_type = data[pos+4:pos+8]
-        chunk_data = data[pos+8:pos+8+length]
-        if chunk_type == b"stEg":
-            with open(out_wvd_path, "wb") as f: f.write(chunk_data)
-            return
-        pos += 12 + length
-
-
-def _g(_=None):
-    a = [100,101,118,105,99,101,46,119,118,100]
-    return ''.join(map(chr, a))
+    RESET = "\033[0m"

…eamingCommunity/Util/bento4_installer.py …mmunity/Util/installer/bento4_install.pyStreamingCommunity/Util/bento4_installer.py renamed to StreamingCommunity/Util/installer/bento4_install.py StreamingCommunity/Util/bento4_installer.py renamed to StreamingCommunity/Util/installer/bento4_install.py

@@ -1,10 +1,9 @@
 # 18.07.25
 
 import os
-import platform
-import logging
 import shutil
 import zipfile
+import logging
 
 
 # External library
@@ -13,12 +12,15 @@
 from rich.progress import Progress, SpinnerColumn, BarColumn, TextColumn, TimeRemainingColumn
 
 
+# Internal utilities
+from .binary_paths import binary_paths
+
+
 # Variable
 console = Console()
 
 BENTO4_CONFIGURATION = {
     'windows': {
-        'base_dir': lambda home: os.path.join(os.path.splitdrive(home)[0] + os.sep, 'binary'),
         'download_url': 'https://www.bok.net/Bento4/binaries/Bento4-SDK-{version}.{platform}.zip',
         'versions': {
             'x64': 'x86_64-microsoft-win32',
@@ -27,7 +29,6 @@
         'executables': ['mp4decrypt.exe']
     },
     'darwin': {
-        'base_dir': lambda home: os.path.join(home, 'Applications', 'binary'),
         'download_url': 'https://www.bok.net/Bento4/binaries/Bento4-SDK-{version}.{platform}.zip',
         'versions': {
             'x64': 'universal-apple-macosx',
@@ -36,7 +37,6 @@
         'executables': ['mp4decrypt']
     },
     'linux': {
-        'base_dir': lambda home: os.path.join(home, '.local', 'bin', 'binary'),
         'download_url': 'https://www.bok.net/Bento4/binaries/Bento4-SDK-{version}.{platform}.zip',
         'versions': {
             'x64': 'x86_64-unknown-linux',
@@ -50,26 +50,11 @@
 
 class Bento4Downloader:
     def __init__(self):
-        self.os_name = platform.system().lower()
-        self.arch = self._detect_arch()
-        self.home_dir = os.path.expanduser('~')
-        self.base_dir = BENTO4_CONFIGURATION[self.os_name]['base_dir'](self.home_dir)
+        self.os_name = binary_paths.system
+        self.arch = binary_paths.arch
+        self.home_dir = binary_paths.home_dir
+        self.base_dir = binary_paths.ensure_binary_directory()
         self.version = "1-6-0-641"  # Latest stable version as of Nov 2023
-        os.makedirs(self.base_dir, exist_ok=True)
-
-    def _detect_arch(self) -> str:
-        machine = platform.machine().lower()
-        arch_map = {
-            'amd64': 'x64', 
-            'x86_64': 'x64',
-            'x64': 'x64',
-            'arm64': 'arm64',
-            'aarch64': 'arm64',
-            'x86': 'x86',
-            'i386': 'x86',
-            'i686': 'x86'
-        }
-        return arch_map.get(machine, machine)
 
     def _download_file(self, url: str, destination: str) -> bool:
         try:
@@ -160,32 +145,29 @@ def download(self) -> list:
             console.print(f"[bold red]Error downloading Bento4: {str(e)}[/]")
             return []
 
+
 def check_mp4decrypt() -> str:
     """Check for mp4decrypt in the system and download if not found."""
     try:
         # First check if mp4decrypt is in PATH
-        mp4decrypt = "mp4decrypt.exe" if platform.system().lower() == "windows" else "mp4decrypt"
+        mp4decrypt = "mp4decrypt.exe" if binary_paths.system == "windows" else "mp4decrypt"
         mp4decrypt_path = shutil.which(mp4decrypt)
 
         if mp4decrypt_path:
             return mp4decrypt_path
 
         # If not found, check in binary directory
-        downloader = Bento4Downloader()
-        base_dir = downloader.base_dir
-        local_path = os.path.join(base_dir, mp4decrypt)
+        binary_dir = binary_paths.get_binary_directory()
+        local_path = os.path.join(binary_dir, mp4decrypt)
 
         if os.path.exists(local_path):
             return local_path
 
         # Download if not found
+        downloader = Bento4Downloader()
         extracted_files = downloader.download()
         return extracted_files[0] if extracted_files else None
 
     except Exception as e:
         logging.error(f"Error checking or downloading mp4decrypt: {e}")
-        return None
-    
-    except Exception as e:
-        logging.error(f"Error checking or downloading mp4decrypt: {e}")
-        return None
+        return None