refactor(netflix): support multiple video ranges and improve profile handling

- Add support for processing multiple video ranges in parallel
- Handle HYBRID range by fetching HDR10 and DV profiles separately
- Introduce get_profiles_for_range method to retrieve profiles for given range
- Refactor profile fetching logic with detailed logging and error handling
- Validate all requested video ranges are supported by the current codec
- Allow H.264 codec only with SDR range and enforce checks for multiple ranges
- Improve track hydration logic to avoid duplicates across ranges and profiles
- Add logging for multi-range processing and profile fetching details

.gitignore

@@ -1,5 +1,4 @@
 # unshackle
-unshackle.yaml
 unshackle.yml
 update_check.json
 *.mkv
@@ -25,7 +24,6 @@ unshackle/certs/
 unshackle/WVDs/
 unshackle/PRDs/
 temp/
-services/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -235,3 +233,4 @@ cython_debug/
 marimo/_static/
 marimo/_lsp/
 __marimo__/
+Cache

CHANGELOG.md

@@ -5,85 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.4.6] - 2025-09-13
-
-### Added
-
-- **Quality-Based CDM Selection**: Dynamic CDM selection based on video resolution
-  - Automatically selects appropriate CDM (L3/L1) based on video track quality
-  - Supports quality thresholds in configuration (>=, >, <=, <, exact match)
-  - Pre-selects optimal CDM based on highest quality across all video tracks
-  - Maintains backward compatibility with existing CDM configurations
-- **Automatic Audio Language Metadata**: Intelligent embedded audio language detection
-  - Automatically sets audio language metadata when no separate audio tracks exist
-  - Smart video track selection based on title language with fallbacks
-  - Enhanced FFmpeg repackaging with audio stream metadata injection
-- **Lazy DRM Loading**: Deferred DRM loading for multi-track key retrieval optimization
-  - Add deferred DRM loading to M3U8 parser to mark tracks for later processing
-  - Just-in-time DRM loading during download process for better performance
-
-### Changed
-
-- **Enhanced CDM Management**: Improved CDM switching logic for multi-quality downloads
-  - CDM selection now based on highest quality track to avoid inefficient switching
-  - Quality-based selection only within same DRM type (Widevine-to-Widevine, PlayReady-to-PlayReady)
-  - Single CDM used per session for better performance and reliability
-
-### Fixed
-
-- **Vault Caching Issues**: Fixed vault count display and NoneType iteration errors
-  - Fix 'NoneType' object is not iterable error in DecryptLabsRemoteCDM
-  - Fix vault count display showing 0/3 instead of actual successful vault count
-- **Service Name Transmission**: Resolved DecryptLabsRemoteCDM service name issues
-  - Fixed DecryptLabsRemoteCDM sending 'generic' instead of proper service names
-  - Added case-insensitive vault lookups for SQLite/MySQL vaults
-  - Added local vault integration to DecryptLabsRemoteCDM
-- **Import Organization**: Improved import ordering and code formatting
-  - Reorder imports in decrypt_labs_remote_cdm.py for better organization
-  - Clean up trailing whitespace in vault files
-
-### Configuration
-
-- **New CDM Configuration Format**: Extended `cdm:` section supports quality-based selection
-  ```yaml
-  cdm:
-    SERVICE_NAME:
-      "<=1080": l3_cdm_name
-      ">1080": l1_cdm_name
-      default: l3_cdm_name
-  ```
-
-## [1.4.5] - 2025-09-09
-
-### Added
-
-- **Enhanced CDM Key Caching**: Improved key caching and session management for L1/L2 devices
-  - Optimized `get_cached_keys_if_exists` functionality for better performance with L1/L2 devices
-  - Enhanced cached key retrieval logic with improved session handling
-- **Widevine Common Certificate Fallback**: Added fallback to Widevine common certificate for L1 devices
-  - Improved compatibility for L1 devices when service certificates are unavailable
-- **Enhanced Vault Loading**: Improved vault loading and key copying logic
-  - Better error handling and key management in vault operations
-- **PSSH Display Optimization**: Truncated PSSH string display in non-debug mode for cleaner output
-- **CDM Error Messaging**: Added error messages for missing service certificates in CDM sessions
-
-### Changed
-
-- **Dynamic Version Headers**: Updated User-Agent headers to use dynamic version strings
-  - DecryptLabsRemoteCDM now uses dynamic version import instead of hardcoded version
-- **Intelligent CDM Caching**: Implemented intelligent caching system for CDM license requests
-  - Enhanced caching logic reduces redundant license requests and improves performance
-- **Enhanced Tag Handling**: Improved tag handling for TV shows and movies from Simkl data
-  - Better metadata processing and formatting for improved media tagging
-
-### Fixed
-
-- **CDM Session Management**: Clean up session data when retrieving cached keys
-  - Remove decrypt_labs_session_id and challenge from session when cached keys exist but there are missing kids
-  - Ensures clean state for subsequent requests and prevents session conflicts
-- **Tag Formatting**: Fixed formatting issues in tag processing
-- **Import Order**: Fixed import order issues in tags module
-
 ## [1.4.4] - 2025-09-02
 
 ### Added

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "unshackle"
-version = "1.4.6"
+version = "1.4.4"
 description = "Modular Movie, TV, and Music Archival Software."
 authors = [{ name = "unshackle team" }]
 requires-python = ">=3.10,<3.13"

unshackle/commands/dl.py

@@ -655,9 +655,12 @@ class dl:
                                 self.log.warning(f"Skipping {color_range.name} video tracks as none are available.")
 
                     if vbitrate:
-                        title.tracks.select_video(lambda x: x.bitrate and x.bitrate // 1000 == vbitrate)
+                         # Tolerance: +100 kbps (upper), -800 kbps (lower)
+                        min_bitrate = max(0, vbitrate - 800)  # Don't go below 0
+                        max_bitrate = vbitrate + 200
+                        title.tracks.select_video(lambda x: x.bitrate and min_bitrate <= x.bitrate // 1000 <= max_bitrate)
                         if not title.tracks.videos:
-                            self.log.error(f"There's no {vbitrate}kbps Video Track...")
+                            self.log.error(f"There's no Video Track with bitrate between {min_bitrate}-{max_bitrate}kbps (requested {vbitrate}kbps)...")
                             sys.exit(1)
 
                     video_languages = [lang for lang in (v_lang or lang) if lang != "best"]
@@ -862,40 +865,9 @@ class dl:
 
             selected_tracks, tracks_progress_callables = title.tracks.tree(add_progress=True)
 
-            for track in title.tracks:
-                if hasattr(track, "needs_drm_loading") and track.needs_drm_loading:
-                    track.load_drm_if_needed(service)
-
             download_table = Table.grid()
             download_table.add_row(selected_tracks)
 
-            video_tracks = title.tracks.videos
-            if video_tracks:
-                highest_quality = max((track.height for track in video_tracks if track.height), default=0)
-                if highest_quality > 0:
-                    if isinstance(self.cdm, (WidevineCdm, DecryptLabsRemoteCDM)) and not (
-                        isinstance(self.cdm, DecryptLabsRemoteCDM) and self.cdm.is_playready
-                    ):
-                        quality_based_cdm = self.get_cdm(
-                            self.service, self.profile, drm="widevine", quality=highest_quality
-                        )
-                        if quality_based_cdm and quality_based_cdm != self.cdm:
-                            self.log.info(
-                                f"Pre-selecting Widevine CDM based on highest quality {highest_quality}p across all video tracks"
-                            )
-                            self.cdm = quality_based_cdm
-                    elif isinstance(self.cdm, (PlayReadyCdm, DecryptLabsRemoteCDM)) and (
-                        isinstance(self.cdm, DecryptLabsRemoteCDM) and self.cdm.is_playready
-                    ):
-                        quality_based_cdm = self.get_cdm(
-                            self.service, self.profile, drm="playready", quality=highest_quality
-                        )
-                        if quality_based_cdm and quality_based_cdm != self.cdm:
-                            self.log.info(
-                                f"Pre-selecting PlayReady CDM based on highest quality {highest_quality}p across all video tracks"
-                            )
-                            self.cdm = quality_based_cdm
-
             dl_start_time = time.time()
 
             if skip_dl:
@@ -1178,13 +1150,8 @@ class dl:
                     with Live(Padding(progress, (0, 5, 1, 5)), console=console):
                         for task_id, task_tracks in multiplex_tasks:
                             progress.start_task(task_id)  # TODO: Needed?
-                            audio_expected = not video_only and not no_audio
                             muxed_path, return_code, errors = task_tracks.mux(
-                                str(title),
-                                progress=partial(progress.update, task_id=task_id),
-                                delete=False,
-                                audio_expected=audio_expected,
-                                title_language=title.language,
+                                str(title), progress=partial(progress.update, task_id=task_id), delete=False
                             )
                             muxed_paths.append(muxed_path)
                             if return_code >= 2:
@@ -1215,7 +1182,13 @@ class dl:
                     final_filename = title.get_filename(media_info, show_service=not no_source)
 
                     if not no_folder and isinstance(title, (Episode, Song)):
-                        final_dir /= title.get_filename(media_info, show_service=not no_source, folder=True)
+                        if isinstance(title, Episode):
+                            # Create nested structure: {title}/Season {season:02}/{filename}
+                            final_dir /= title.get_filename(media_info, show_service=not no_source, folder=True)
+                            final_dir /= title.get_season_folder()
+                        else:
+                            # For Song, use existing logic
+                            final_dir /= title.get_filename(media_info, show_service=not no_source, folder=True)
 
                     final_dir.mkdir(parents=True, exist_ok=True)
                     final_path = final_dir / f"{final_filename}{muxed_path.suffix}"
@@ -1257,9 +1230,6 @@ class dl:
         if not drm:
             return
 
-        if isinstance(track, Video) and track.height:
-            pass
-
         if isinstance(drm, Widevine):
             if not isinstance(self.cdm, (WidevineCdm, DecryptLabsRemoteCDM)) or (
                 isinstance(self.cdm, DecryptLabsRemoteCDM) and self.cdm.is_playready
@@ -1268,7 +1238,6 @@ class dl:
                 if widevine_cdm:
                     self.log.info("Switching to Widevine CDM for Widevine content")
                     self.cdm = widevine_cdm
-
         elif isinstance(drm, PlayReady):
             if not isinstance(self.cdm, (PlayReadyCdm, DecryptLabsRemoteCDM)) or (
                 isinstance(self.cdm, DecryptLabsRemoteCDM) and not self.cdm.is_playready
@@ -1288,12 +1257,7 @@ class dl:
                 if pre_existing_tree:
                     cek_tree = pre_existing_tree
 
-                need_license = False
-                all_kids = list(drm.kids)
-                if track_kid and track_kid not in all_kids:
-                    all_kids.append(track_kid)
-
-                for kid in all_kids:
+                for kid in drm.kids:
                     if kid in drm.content_keys:
                         continue
 
@@ -1313,51 +1277,46 @@ class dl:
                             if not pre_existing_tree:
                                 table.add_row(cek_tree)
                             raise Widevine.Exceptions.CEKNotFound(msg)
-                        else:
-                            need_license = True
 
-                    if kid not in drm.content_keys and cdm_only:
-                        need_license = True
+                    if kid not in drm.content_keys and not vaults_only:
+                        from_vaults = drm.content_keys.copy()
 
-                if need_license and not vaults_only:
-                    from_vaults = drm.content_keys.copy()
+                        try:
+                            if self.service == "NF":
+                                drm.get_NF_content_keys(cdm=self.cdm, licence=licence, certificate=certificate)
+                            else:
+                                drm.get_content_keys(cdm=self.cdm, licence=licence, certificate=certificate)
+                        except Exception as e:
+                            if isinstance(e, (Widevine.Exceptions.EmptyLicense, Widevine.Exceptions.CEKNotFound)):
+                                msg = str(e)
+                            else:
+                                msg = f"An exception occurred in the Service's license function: {e}"
+                            cek_tree.add(f"[logging.level.error]{msg}")
+                            if not pre_existing_tree:
+                                table.add_row(cek_tree)
+                            raise e
 
-                    try:
-                        if self.service == "NF":
-                            drm.get_NF_content_keys(cdm=self.cdm, licence=licence, certificate=certificate)
-                        else:
-                            drm.get_content_keys(cdm=self.cdm, licence=licence, certificate=certificate)
-                    except Exception as e:
-                        if isinstance(e, (Widevine.Exceptions.EmptyLicense, Widevine.Exceptions.CEKNotFound)):
-                            msg = str(e)
-                        else:
-                            msg = f"An exception occurred in the Service's license function: {e}"
-                        cek_tree.add(f"[logging.level.error]{msg}")
-                        if not pre_existing_tree:
-                            table.add_row(cek_tree)
-                        raise e
+                        for kid_, key in drm.content_keys.items():
+                            if key == "0" * 32:
+                                key = f"[red]{key}[/]"
+                            label = f"[text2]{kid_.hex}:{key}{is_track_kid}"
+                            if not any(f"{kid_.hex}:{key}" in x.label for x in cek_tree.children):
+                                cek_tree.add(label)
 
-                    for kid_, key in drm.content_keys.items():
-                        if key == "0" * 32:
-                            key = f"[red]{key}[/]"
-                        is_track_kid_marker = ["", "*"][kid_ == track_kid]
-                        label = f"[text2]{kid_.hex}:{key}{is_track_kid_marker}"
-                        if not any(f"{kid_.hex}:{key}" in x.label for x in cek_tree.children):
-                            cek_tree.add(label)
+                        drm.content_keys = {
+                            kid_: key for kid_, key in drm.content_keys.items() if key and key.count("0") != len(key)
+                        }
 
-                    drm.content_keys = {
-                        kid_: key for kid_, key in drm.content_keys.items() if key and key.count("0") != len(key)
-                    }
+                        # The CDM keys may have returned blank content keys for KIDs we got from vaults.
+                        # So we re-add the keys from vaults earlier overwriting blanks or removed KIDs data.
+                        drm.content_keys.update(from_vaults)
 
-                    # The CDM keys may have returned blank content keys for KIDs we got from vaults.
-                    # So we re-add the keys from vaults earlier overwriting blanks or removed KIDs data.
-                    drm.content_keys.update(from_vaults)
-
-                    successful_caches = self.vaults.add_keys(drm.content_keys)
-                    self.log.info(
-                        f"Cached {len(drm.content_keys)} Key{'' if len(drm.content_keys) == 1 else 's'} to "
-                        f"{successful_caches}/{len(self.vaults)} Vaults"
-                    )
+                        successful_caches = self.vaults.add_keys(drm.content_keys)
+                        self.log.info(
+                            f"Cached {len(drm.content_keys)} Key{'' if len(drm.content_keys) == 1 else 's'} to "
+                            f"{successful_caches}/{len(self.vaults)} Vaults"
+                        )
+                        break  # licensing twice will be unnecessary
 
                 if track_kid and track_kid not in drm.content_keys:
                     msg = f"No Content Key for KID {track_kid.hex} was returned in the License"
@@ -1397,12 +1356,7 @@ class dl:
                 if pre_existing_tree:
                     cek_tree = pre_existing_tree
 
-                need_license = False
-                all_kids = list(drm.kids)
-                if track_kid and track_kid not in all_kids:
-                    all_kids.append(track_kid)
-
-                for kid in all_kids:
+                for kid in drm.kids:
                     if kid in drm.content_keys:
                         continue
 
@@ -1422,40 +1376,35 @@ class dl:
                             if not pre_existing_tree:
                                 table.add_row(cek_tree)
                             raise PlayReady.Exceptions.CEKNotFound(msg)
-                        else:
-                            need_license = True
 
-                    if kid not in drm.content_keys and cdm_only:
-                        need_license = True
+                    if kid not in drm.content_keys and not vaults_only:
+                        from_vaults = drm.content_keys.copy()
 
-                if need_license and not vaults_only:
-                    from_vaults = drm.content_keys.copy()
+                        try:
+                            drm.get_content_keys(cdm=self.cdm, licence=licence, certificate=certificate)
+                        except Exception as e:
+                            if isinstance(e, (PlayReady.Exceptions.EmptyLicense, PlayReady.Exceptions.CEKNotFound)):
+                                msg = str(e)
+                            else:
+                                msg = f"An exception occurred in the Service's license function: {e}"
+                            cek_tree.add(f"[logging.level.error]{msg}")
+                            if not pre_existing_tree:
+                                table.add_row(cek_tree)
+                            raise e
 
-                    try:
-                        drm.get_content_keys(cdm=self.cdm, licence=licence, certificate=certificate)
-                    except Exception as e:
-                        if isinstance(e, (PlayReady.Exceptions.EmptyLicense, PlayReady.Exceptions.CEKNotFound)):
-                            msg = str(e)
-                        else:
-                            msg = f"An exception occurred in the Service's license function: {e}"
-                        cek_tree.add(f"[logging.level.error]{msg}")
-                        if not pre_existing_tree:
-                            table.add_row(cek_tree)
-                        raise e
+                        for kid_, key in drm.content_keys.items():
+                            label = f"[text2]{kid_.hex}:{key}{is_track_kid}"
+                            if not any(f"{kid_.hex}:{key}" in x.label for x in cek_tree.children):
+                                cek_tree.add(label)
 
-                    for kid_, key in drm.content_keys.items():
-                        is_track_kid_marker = ["", "*"][kid_ == track_kid]
-                        label = f"[text2]{kid_.hex}:{key}{is_track_kid_marker}"
-                        if not any(f"{kid_.hex}:{key}" in x.label for x in cek_tree.children):
-                            cek_tree.add(label)
+                        drm.content_keys.update(from_vaults)
 
-                    drm.content_keys.update(from_vaults)
-
-                    successful_caches = self.vaults.add_keys(drm.content_keys)
-                    self.log.info(
-                        f"Cached {len(drm.content_keys)} Key{'' if len(drm.content_keys) == 1 else 's'} to "
-                        f"{successful_caches}/{len(self.vaults)} Vaults"
-                    )
+                        successful_caches = self.vaults.add_keys(drm.content_keys)
+                        self.log.info(
+                            f"Cached {len(drm.content_keys)} Key{'' if len(drm.content_keys) == 1 else 's'} to "
+                            f"{successful_caches}/{len(self.vaults)} Vaults"
+                        )
+                        break
 
                 if track_kid and track_kid not in drm.content_keys:
                     msg = f"No Content Key for KID {track_kid.hex} was returned in the License"
@@ -1541,11 +1490,9 @@ class dl:
         service: str,
         profile: Optional[str] = None,
         drm: Optional[str] = None,
-        quality: Optional[int] = None,
     ) -> Optional[object]:
         """
         Get CDM for a specified service (either Local or Remote CDM).
-        Now supports quality-based selection when quality is provided.
         Raises a ValueError if there's a problem getting a CDM.
         """
         cdm_name = config.cdm.get(service) or config.cdm.get("default")
@@ -1553,82 +1500,23 @@ class dl:
             return None
 
         if isinstance(cdm_name, dict):
-            if quality:
-                quality_match = None
-                quality_keys = []
-
-                for key in cdm_name.keys():
-                    if (
-                        isinstance(key, str)
-                        and any(op in key for op in [">=", ">", "<=", "<"])
-                        or (isinstance(key, str) and key.isdigit())
-                    ):
-                        quality_keys.append(key)
-
-                def sort_quality_key(key):
-                    if key.isdigit():
-                        return (0, int(key))  # Exact matches first
-                    elif key.startswith(">="):
-                        return (1, -int(key[2:]))  # >= descending
-                    elif key.startswith(">"):
-                        return (1, -int(key[1:]))  # > descending
-                    elif key.startswith("<="):
-                        return (2, int(key[2:]))  # <= ascending
-                    elif key.startswith("<"):
-                        return (2, int(key[1:]))  # < ascending
-                    return (3, 0)  # Other keys last
-
-                quality_keys.sort(key=sort_quality_key)
-
-                for key in quality_keys:
-                    if key.isdigit() and quality == int(key):
-                        quality_match = cdm_name[key]
-                        self.log.info(f"Selected CDM based on exact quality match {quality}p: {quality_match}")
-                        break
-                    elif key.startswith(">="):
-                        threshold = int(key[2:])
-                        if quality >= threshold:
-                            quality_match = cdm_name[key]
-                            self.log.info(f"Selected CDM based on quality {quality}p >= {threshold}p: {quality_match}")
-                            break
-                    elif key.startswith(">"):
-                        threshold = int(key[1:])
-                        if quality > threshold:
-                            quality_match = cdm_name[key]
-                            self.log.info(f"Selected CDM based on quality {quality}p > {threshold}p: {quality_match}")
-                            break
-                    elif key.startswith("<="):
-                        threshold = int(key[2:])
-                        if quality <= threshold:
-                            quality_match = cdm_name[key]
-                            self.log.info(f"Selected CDM based on quality {quality}p <= {threshold}p: {quality_match}")
-                            break
-                    elif key.startswith("<"):
-                        threshold = int(key[1:])
-                        if quality < threshold:
-                            quality_match = cdm_name[key]
-                            self.log.info(f"Selected CDM based on quality {quality}p < {threshold}p: {quality_match}")
-                            break
-
-                if quality_match:
-                    cdm_name = quality_match
-
-            if isinstance(cdm_name, dict):
-                lower_keys = {k.lower(): v for k, v in cdm_name.items()}
-                if {"widevine", "playready"} & lower_keys.keys():
-                    drm_key = None
-                    if drm:
-                        drm_key = {
-                            "wv": "widevine",
-                            "widevine": "widevine",
-                            "pr": "playready",
-                            "playready": "playready",
-                        }.get(drm.lower())
-                    cdm_name = lower_keys.get(drm_key or "widevine") or lower_keys.get("playready")
-                else:
-                    cdm_name = cdm_name.get(profile) or cdm_name.get("default") or config.cdm.get("default")
-                if not cdm_name:
+            lower_keys = {k.lower(): v for k, v in cdm_name.items()}
+            if {"widevine", "playready"} & lower_keys.keys():
+                drm_key = None
+                if drm:
+                    drm_key = {
+                        "wv": "widevine",
+                        "widevine": "widevine",
+                        "pr": "playready",
+                        "playready": "playready",
+                    }.get(drm.lower())
+                cdm_name = lower_keys.get(drm_key or "widevine") or lower_keys.get("playready")
+            else:
+                if not profile:
                     return None
+                cdm_name = cdm_name.get(profile) or config.cdm.get("default")
+            if not cdm_name:
+                return None
 
         cdm_api = next(iter(x for x in config.remote_cdm if x["name"] == cdm_name), None)
         if cdm_api:

unshackle/core/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.6"
+__version__ = "1.4.4"

unshackle/core/cdm/decrypt_labs_remote_cdm.py

@@ -10,7 +10,6 @@ from pywidevine.cdm import Cdm as WidevineCdm
 from pywidevine.device import DeviceTypes
 from requests import Session
 
-from unshackle.core import __version__
 from unshackle.core.vaults import Vaults
 
 
@@ -151,7 +150,7 @@ class DecryptLabsRemoteCDM:
             {
                 "decrypt-labs-api-key": self.secret,
                 "Content-Type": "application/json",
-                "User-Agent": f"unshackle-decrypt-labs-cdm/{__version__}",
+                "User-Agent": "unshackle-decrypt-labs-cdm/1.0",
             }
         )
 
@@ -353,19 +352,17 @@ class DecryptLabsRemoteCDM:
         Generate a license challenge using Decrypt Labs API with intelligent caching.
 
         This method implements smart caching logic that:
-        1. First checks local vaults for required keys
-        2. Attempts to retrieve cached keys from the API
-        3. If required KIDs are set, compares available keys (vault + cached) against requirements
-        4. Only makes a license request if keys are missing
-        5. Returns empty challenge if all required keys are available
+        1. First attempts to retrieve cached keys from the API
+        2. If required KIDs are set, compares cached keys against requirements
+        3. Only makes a license request if keys are missing
+        4. Returns empty challenge if all required keys are cached
 
         The intelligent caching works as follows:
-        - Local vaults: Always checked first if available
         - For L1/L2 devices: Always prioritizes cached keys (API automatically optimizes)
         - For other devices: Uses cache retry logic based on session state
         - With required KIDs set: Only requests license for missing keys
         - Without required KIDs: Returns any available cached keys
-        - For PlayReady: Combines vault, cached, and license keys seamlessly
+        - For PlayReady: Combines cached keys with license keys seamlessly
 
         Args:
             session_id: Session identifier
@@ -374,7 +371,7 @@ class DecryptLabsRemoteCDM:
             privacy_mode: Whether to use privacy mode - for compatibility only
 
         Returns:
-            License challenge as bytes, or empty bytes if available keys satisfy requirements
+            License challenge as bytes, or empty bytes if cached keys satisfy requirements
 
         Raises:
             InvalidSession: If session ID is invalid
@@ -383,7 +380,6 @@ class DecryptLabsRemoteCDM:
         Note:
             Call set_required_kids() before this method for optimal caching behavior.
             L1/L2 devices automatically use cached keys when available per API design.
-            Local vault keys are always checked first when vaults are available.
         """
         _ = license_type, privacy_mode
 
@@ -396,31 +392,6 @@ class DecryptLabsRemoteCDM:
         init_data = self._get_init_data_from_pssh(pssh_or_wrm)
         already_tried_cache = session.get("tried_cache", False)
 
-        if self.vaults and self._required_kids:
-            vault_keys = []
-            for kid_str in self._required_kids:
-                try:
-                    clean_kid = kid_str.replace("-", "")
-                    if len(clean_kid) == 32:
-                        kid_uuid = UUID(hex=clean_kid)
-                    else:
-                        kid_uuid = UUID(hex=clean_kid.ljust(32, "0"))
-                    key, _ = self.vaults.get_key(kid_uuid)
-                    if key and key.count("0") != len(key):
-                        vault_keys.append({"kid": kid_str, "key": key, "type": "CONTENT"})
-                except (ValueError, TypeError):
-                    continue
-
-            if vault_keys:
-                vault_kids = set(k["kid"] for k in vault_keys)
-                required_kids = set(self._required_kids)
-
-                if required_kids.issubset(vault_kids):
-                    session["keys"] = vault_keys
-                    return b""
-                else:
-                    session["vault_keys"] = vault_keys
-
         if self.device_name in ["L1", "L2"]:
             get_cached_keys = True
         else:
@@ -432,7 +403,7 @@ class DecryptLabsRemoteCDM:
             "get_cached_keys_if_exists": get_cached_keys,
         }
 
-        if self.service_name:
+        if self.device_name in ["L1", "L2", "SL2", "SL3"] and self.service_name:
             request_data["service"] = self.service_name
 
         if session["service_certificate"]:
@@ -469,22 +440,17 @@ class DecryptLabsRemoteCDM:
             """
             cached_keys = data.get("cached_keys", [])
             parsed_keys = self._parse_cached_keys(cached_keys)
-
-            all_available_keys = list(parsed_keys)
-            if "vault_keys" in session:
-                all_available_keys.extend(session["vault_keys"])
-
-            session["keys"] = all_available_keys
+            session["keys"] = parsed_keys
             session["tried_cache"] = True
 
             if self._required_kids:
-                available_kids = set()
-                for key in all_available_keys:
+                cached_kids = set()
+                for key in parsed_keys:
                     if isinstance(key, dict) and "kid" in key:
-                        available_kids.add(key["kid"].replace("-", "").lower())
+                        cached_kids.add(key["kid"].replace("-", "").lower())
 
                 required_kids = set(self._required_kids)
-                missing_kids = required_kids - available_kids
+                missing_kids = required_kids - cached_kids
 
                 if missing_kids:
                     session["cached_keys"] = parsed_keys
@@ -618,63 +584,51 @@ class DecryptLabsRemoteCDM:
 
         license_keys = self._parse_keys_response(data)
 
-        all_keys = []
+        if self.is_playready and "cached_keys" in session:
+            """
+            Combine cached keys with license keys for PlayReady content.
 
-        if "vault_keys" in session:
-            all_keys.extend(session["vault_keys"])
-
-        if "cached_keys" in session:
+            This ensures we have both the cached keys (obtained earlier) and
+            any additional keys from the license response, without duplicates.
+            """
             cached_keys = session.get("cached_keys", [])
-            if cached_keys:
-                for cached_key in cached_keys:
-                    all_keys.append(cached_key)
+            all_keys = list(cached_keys)
 
-        for license_key in license_keys:
-            already_exists = False
-            license_kid = None
-            if isinstance(license_key, dict) and "kid" in license_key:
-                license_kid = license_key["kid"].replace("-", "").lower()
-            elif hasattr(license_key, "kid"):
-                license_kid = str(license_key.kid).replace("-", "").lower()
-            elif hasattr(license_key, "key_id"):
-                license_kid = str(license_key.key_id).replace("-", "").lower()
+            for license_key in license_keys:
+                already_exists = False
+                license_kid = None
+                if isinstance(license_key, dict) and "kid" in license_key:
+                    license_kid = license_key["kid"].replace("-", "").lower()
+                elif hasattr(license_key, "kid"):
+                    license_kid = str(license_key.kid).replace("-", "").lower()
+                elif hasattr(license_key, "key_id"):
+                    license_kid = str(license_key.key_id).replace("-", "").lower()
 
-            if license_kid:
-                for existing_key in all_keys:
-                    existing_kid = None
-                    if isinstance(existing_key, dict) and "kid" in existing_key:
-                        existing_kid = existing_key["kid"].replace("-", "").lower()
-                    elif hasattr(existing_key, "kid"):
-                        existing_kid = str(existing_key.kid).replace("-", "").lower()
-                    elif hasattr(existing_key, "key_id"):
-                        existing_kid = str(existing_key.key_id).replace("-", "").lower()
+                if license_kid:
+                    for cached_key in cached_keys:
+                        cached_kid = None
+                        if isinstance(cached_key, dict) and "kid" in cached_key:
+                            cached_kid = cached_key["kid"].replace("-", "").lower()
+                        elif hasattr(cached_key, "kid"):
+                            cached_kid = str(cached_key.kid).replace("-", "").lower()
+                        elif hasattr(cached_key, "key_id"):
+                            cached_kid = str(cached_key.key_id).replace("-", "").lower()
 
-                    if existing_kid == license_kid:
-                        already_exists = True
-                        break
+                        if cached_kid == license_kid:
+                            already_exists = True
+                            break
 
-            if not already_exists:
-                all_keys.append(license_key)
+                if not already_exists:
+                    all_keys.append(license_key)
 
-        session["keys"] = all_keys
-        session.pop("cached_keys", None)
-        session.pop("vault_keys", None)
+            session["keys"] = all_keys
+            session["cached_keys"] = None
+        else:
+            session["keys"] = license_keys
 
         if self.vaults and session["keys"]:
-            key_dict = {}
-            for key in session["keys"]:
-                if key["type"] == "CONTENT":
-                    try:
-                        clean_kid = key["kid"].replace("-", "")
-                        if len(clean_kid) == 32:
-                            kid_uuid = UUID(hex=clean_kid)
-                        else:
-                            kid_uuid = UUID(hex=clean_kid.ljust(32, "0"))
-                        key_dict[kid_uuid] = key["key"]
-                    except (ValueError, TypeError):
-                        continue
-            if key_dict:
-                self.vaults.add_keys(key_dict)
+            key_dict = {UUID(hex=key["kid"]): key["key"] for key in session["keys"] if key["type"] == "CONTENT"}
+            self.vaults.add_keys(key_dict)
 
     def get_keys(self, session_id: bytes, type_: Optional[str] = None) -> List[Key]:
         """

unshackle/core/downloaders/aria2c.py

@@ -137,7 +137,6 @@ def download(
     if len(urls) > 1:
         split = 1
         file_allocation = "none"
-
     arguments = [
         # [Basic Options]
         "--input-file",
@@ -189,19 +188,36 @@ def download(
         p.stdin.close()
 
         while p.poll() is None:
+            # Get global statistics via RPC
             global_stats: dict[str, Any] = (
                 rpc(caller=partial(rpc_session.post, url=rpc_uri), secret=rpc_secret, method="aria2.getGlobalStat")
                 or {}
             )
 
             number_stopped = int(global_stats.get("numStoppedTotal", 0))
-            download_speed = int(global_stats.get("downloadSpeed", -1))
+            global_download_speed = int(global_stats.get("downloadSpeed", 0))
 
-            if number_stopped:
-                yield dict(completed=number_stopped)
-            if download_speed != -1:
-                yield dict(downloaded=f"{filesize.decimal(download_speed)}/s")
+            # Get active downloads via RPC for detailed progress tracking
+            active_downloads: list[dict[str, Any]] = (
+                rpc(
+                    caller=partial(rpc_session.post, url=rpc_uri),
+                    secret=rpc_secret,
+                    method="aria2.tellActive",
+                )
+                or []
+            )
 
+            # Calculate totals from active downloads
+            total_downloaded_size = 0
+            total_content_size = 0
+            active_download_speed = 0
+            
+            for download in active_downloads:
+                total_downloaded_size += int(download.get("completedLength", 0))
+                total_content_size += int(download.get("totalLength", 0))
+                active_download_speed += int(download.get("downloadSpeed", 0))
+
+            # Get stopped downloads via RPC to check for errors and completion
             stopped_downloads: list[dict[str, Any]] = (
                 rpc(
                     caller=partial(rpc_session.post, url=rpc_uri),
@@ -212,22 +228,46 @@ def download(
                 or []
             )
 
-            for dl in stopped_downloads:
-                if dl["status"] == "error":
+            # Add completed downloads to totals and handle errors
+            for download in stopped_downloads:
+                if download["status"] == "complete":
+                    completed_length = int(download.get("completedLength", 0))
+                    total_downloaded_size += completed_length
+                    total_content_size += completed_length
+                elif download["status"] == "error":
                     used_uri = next(
                         uri["uri"]
-                        for file in dl["files"]
+                        for file in download["files"]
                         if file["selected"] == "true"
                         for uri in file["uris"]
                         if uri["status"] == "used"
                     )
-                    error = f"Download Error (#{dl['gid']}): {dl['errorMessage']} ({dl['errorCode']}), {used_uri}"
+                    error = f"Download Error (#{download['gid']}): {download['errorMessage']} ({download['errorCode']}), {used_uri}"
                     error_pretty = "\n          ".join(
                         textwrap.wrap(error, width=console.width - 20, initial_indent="")
                     )
                     console.log(Text.from_ansi("\n[Aria2c]: " + error_pretty))
                     raise ValueError(error)
 
+            # Yield progress information
+            if total_content_size > 0:
+                downloaded = f"{filesize.decimal(total_downloaded_size)}/{filesize.decimal(total_content_size)} {filesize.decimal(active_download_speed)}/s"
+                yield dict(
+                    downloaded=downloaded,
+                    total=total_content_size,
+                    completed=total_downloaded_size
+                )
+            elif global_download_speed > 0:
+                yield dict(
+                    downloaded=f"{filesize.decimal(global_download_speed)}/s",
+                    speed_bytes_per_sec=global_download_speed
+                )
+
+            # Yield completion count
+            if number_stopped:
+                yield dict(completed=number_stopped)
+
+            # Exit when all downloads are complete
             if number_stopped == len(urls):
                 rpc(caller=partial(rpc_session.post, url=rpc_uri), secret=rpc_secret, method="aria2.shutdown")
                 break
@@ -274,11 +314,14 @@ def aria2c(
 
     Yields the following download status updates while chunks are downloading:
 
-    - {total: 100} (100% download total)
-    - {completed: 1} (1% download progress out of 100%)
-    - {downloaded: "10.1 MB/s"} (currently downloading at a rate of 10.1 MB/s)
+    - {total: 100} (total number of URLs to download)
+    - {completed: 1} (number of completed downloads)
+    - {downloaded: "50.2 MB/128.5 MB 10.1 MB/s", total: 134742016, completed: 52428800} (progress data)
+    - {downloaded: "10.1 MB/s", speed_bytes_per_sec: 10485760} (speed fallback data)
 
     The data is in the same format accepted by rich's progress.update() function.
+    However, The `downloaded` and `speed_bytes_per_sec` keys are custom and not natively 
+    accepted by all rich progress bars.
 
     Parameters:
         urls: Web URL(s) to file(s) to download. You can use a dictionary with the key
@@ -318,6 +361,7 @@ def aria2c(
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
         )
+        time.sleep(1)
 
         try:
             yield from download(urls, output_dir, filename, headers, cookies, local_proxy, max_workers)

unshackle/core/manifests/m3u8.py

@@ -2,11 +2,17 @@
 
 from __future__ import annotations
 
-from typing import Optional
+from typing import Optional, Union
 
+import httpx
 import m3u8
+from pyplayready.cdm import Cdm as PlayReadyCdm
+from pyplayready.system.pssh import PSSH as PR_PSSH
+from pywidevine.cdm import Cdm as WidevineCdm
+from pywidevine.pssh import PSSH as WV_PSSH
 from requests import Session
 
+from unshackle.core.drm import PlayReady, Widevine
 from unshackle.core.manifests.hls import HLS
 from unshackle.core.tracks import Tracks
 
@@ -15,17 +21,54 @@ def parse(
     master: m3u8.M3U8,
     language: str,
     *,
-    session: Optional[Session] = None,
+    session: Optional[Union[Session, httpx.Client]] = None,
 ) -> Tracks:
-    """Parse a variant playlist to ``Tracks`` with basic information, defer DRM loading."""
+    """Parse a variant playlist to ``Tracks`` with DRM information."""
     tracks = HLS(master, session=session).to_tracks(language)
 
-    bool(master.session_keys or HLS.parse_session_data_keys(master, session or Session()))
+    need_wv = not any(isinstance(d, Widevine) for t in tracks for d in (t.drm or []))
+    need_pr = not any(isinstance(d, PlayReady) for t in tracks for d in (t.drm or []))
 
-    if True:
-        for t in tracks.videos + tracks.audio:
-            t.needs_drm_loading = True
-            t.session = session
+    if (need_wv or need_pr) and tracks.videos:
+        if not session:
+            session = Session()
+
+        session_keys = list(master.session_keys or [])
+        session_keys.extend(HLS.parse_session_data_keys(master, session))
+
+        for drm_obj in HLS.get_all_drm(session_keys):
+            if need_wv and isinstance(drm_obj, Widevine):
+                for t in tracks.videos + tracks.audio:
+                    t.drm = [d for d in (t.drm or []) if not isinstance(d, Widevine)] + [drm_obj]
+                need_wv = False
+            elif need_pr and isinstance(drm_obj, PlayReady):
+                for t in tracks.videos + tracks.audio:
+                    t.drm = [d for d in (t.drm or []) if not isinstance(d, PlayReady)] + [drm_obj]
+                need_pr = False
+            if not need_wv and not need_pr:
+                break
+
+    if (need_wv or need_pr) and tracks.videos:
+        first_video = tracks.videos[0]
+        playlist = m3u8.load(first_video.url)
+        for key in playlist.keys or []:
+            if not key or not key.keyformat:
+                continue
+            fmt = key.keyformat.lower()
+            if need_wv and fmt == WidevineCdm.urn:
+                pssh_b64 = key.uri.split(",")[-1]
+                drm = Widevine(pssh=WV_PSSH(pssh_b64))
+                for t in tracks.videos + tracks.audio:
+                    t.drm = [d for d in (t.drm or []) if not isinstance(d, Widevine)] + [drm]
+                need_wv = False
+            elif need_pr and (fmt == PlayReadyCdm or "com.microsoft.playready" in fmt):
+                pssh_b64 = key.uri.split(",")[-1]
+                drm = PlayReady(pssh=PR_PSSH(pssh_b64), pssh_b64=pssh_b64)
+                for t in tracks.videos + tracks.audio:
+                    t.drm = [d for d in (t.drm or []) if not isinstance(d, PlayReady)] + [drm]
+                need_pr = False
+            if not need_wv and not need_pr:
+                break
 
     return tracks
 

unshackle/core/titles/episode.py

@@ -92,14 +92,14 @@ class Episode(Title):
         primary_audio_track = next(iter(media_info.audio_tracks), None)
         unique_audio_languages = len({x.language.split("-")[0] for x in media_info.audio_tracks if x.language})
 
-        # Title [Year] SXXEXX Name (or Title [Year] SXX if folder)
+        # Title [Year] SXXEXX Name (or just Title for main folder)
         if folder:
             name = f"{self.title}"
             if self.year and config.series_year:
-                name += f" {self.year}"
-            name += f" S{self.season:02}"
+                name += f" ({self.year})"
+            return name
         else:
-            name = "{title}{year} S{season:02}E{number:02} {name}".format(
+            name = "{title}{year} S{season:02}E{number:02} - {name} -".format(
                 title=self.title.replace("$", "S"),  # e.g., Arli$$
                 year=f" {self.year}" if self.year and config.series_year else "",
                 season=self.season,
@@ -128,19 +128,19 @@ class Episode(Title):
                 name += f" {resolution}p"
 
             # Service
-            if show_service:
-                name += f" {self.service.__name__}"
+            # if show_service:
+            #     name += f" {self.service.__name__}"
 
-            # 'WEB-DL'
-            name += " WEB-DL"
+            # # 'WEB-DL'
+            # name += " WEB-DL"
 
-            # DUAL
-            if unique_audio_languages == 2:
-                name += " DUAL"
+            # # DUAL
+            # if unique_audio_languages == 2:
+            #     name += " DUAL"
 
-            # MULTi
-            if unique_audio_languages > 2:
-                name += " MULTi"
+            # # MULTi
+            # if unique_audio_languages > 2:
+            #     name += " MULTi"
 
             # Audio Codec + Channels (+ feature)
             if primary_audio_track:
@@ -181,14 +181,20 @@ class Episode(Title):
                     name += " HFR"
                 name += f" {VIDEO_CODEC_MAP.get(codec, codec)}"
 
-            if config.tag:
-                name += f"-{config.tag}"
+            # if config.tag:
+            #     name += f"-{config.tag}"
 
             return sanitize_filename(name)
         else:
             # Simple naming style without technical details - use spaces instead of dots
             return sanitize_filename(name, " ")
 
+    def get_season_folder(self) -> str:
+        """
+        Get the season folder name in the format 'Season XX'.
+        """
+        return f"Season {self.season:02d}"
+
 
 class Series(SortedKeyList, ABC):
     def __init__(self, iterable: Optional[Iterable] = None):

unshackle/core/titles/movie.py

@@ -56,7 +56,7 @@ class Movie(Title):
         unique_audio_languages = len({x.language.split("-")[0] for x in media_info.audio_tracks if x.language})
 
         # Name (Year)
-        name = str(self).replace("$", "S")  # e.g., Arli$$
+        name = str(self).replace("$", "S") + " -"  # e.g., Arli$$
 
         if config.scene_naming:
             # Resolution
@@ -78,20 +78,20 @@ class Movie(Title):
                     resolution = int(primary_video_track.width * (9 / 16))
                 name += f" {resolution}p"
 
-            # Service
-            if show_service:
-                name += f" {self.service.__name__}"
+            # # Service
+            # if show_service:
+            #     name += f" {self.service.__name__}"
 
-            # 'WEB-DL'
-            name += " WEB-DL"
+            # # 'WEB-DL'
+            # name += " WEB-DL"
 
-            # DUAL
-            if unique_audio_languages == 2:
-                name += " DUAL"
+            # # DUAL
+            # if unique_audio_languages == 2:
+            #     name += " DUAL"
 
-            # MULTi
-            if unique_audio_languages > 2:
-                name += " MULTi"
+            # # MULTi
+            # if unique_audio_languages > 2:
+            #     name += " MULTi"
 
             # Audio Codec + Channels (+ feature)
             if primary_audio_track:
@@ -132,8 +132,8 @@ class Movie(Title):
                     name += " HFR"
                 name += f" {VIDEO_CODEC_MAP.get(codec, codec)}"
 
-            if config.tag:
-                name += f"-{config.tag}"
+            # if config.tag:
+            #     name += f"-{config.tag}"
 
             return sanitize_filename(name)
         else:

unshackle/core/tracks/track.py

@@ -420,7 +420,7 @@ class Track:
             for drm in self.drm:
                 if isinstance(drm, PlayReady):
                     return drm
-        elif hasattr(cdm, "is_playready"):
+        elif hasattr(cdm, 'is_playready'):
             if cdm.is_playready:
                 for drm in self.drm:
                     if isinstance(drm, PlayReady):
@@ -473,83 +473,6 @@ class Track:
                 if tenc.key_ID.int != 0:
                     return tenc.key_ID
 
-    def load_drm_if_needed(self, service=None) -> bool:
-        """
-        Load DRM information for this track if it was deferred during parsing.
-
-        Args:
-            service: Service instance that can fetch track-specific DRM info
-
-        Returns:
-            True if DRM was loaded or already present, False if failed
-        """
-        if not getattr(self, "needs_drm_loading", False):
-            return bool(self.drm)
-
-        if self.drm:
-            self.needs_drm_loading = False
-            return True
-
-        if not service or not hasattr(service, "get_track_drm"):
-            return self.load_drm_from_playlist()
-
-        try:
-            track_drm = service.get_track_drm(self)
-            if track_drm:
-                self.drm = track_drm if isinstance(track_drm, list) else [track_drm]
-                self.needs_drm_loading = False
-                return True
-        except Exception as e:
-            raise ValueError(f"Failed to load DRM from service for track {self.id}: {e}")
-
-        return self.load_drm_from_playlist()
-
-    def load_drm_from_playlist(self) -> bool:
-        """
-        Fallback method to load DRM by fetching this track's individual playlist.
-        """
-        if self.drm:
-            self.needs_drm_loading = False
-            return True
-
-        try:
-            import m3u8
-            from pyplayready.cdm import Cdm as PlayReadyCdm
-            from pyplayready.system.pssh import PSSH as PR_PSSH
-            from pywidevine.cdm import Cdm as WidevineCdm
-            from pywidevine.pssh import PSSH as WV_PSSH
-
-            session = getattr(self, "session", None) or Session()
-
-            response = session.get(self.url)
-            playlist = m3u8.loads(response.text, self.url)
-
-            drm_list = []
-
-            for key in playlist.keys or []:
-                if not key or not key.keyformat:
-                    continue
-
-                fmt = key.keyformat.lower()
-                if fmt == WidevineCdm.urn:
-                    pssh_b64 = key.uri.split(",")[-1]
-                    drm = Widevine(pssh=WV_PSSH(pssh_b64))
-                    drm_list.append(drm)
-                elif fmt == PlayReadyCdm or "com.microsoft.playready" in fmt:
-                    pssh_b64 = key.uri.split(",")[-1]
-                    drm = PlayReady(pssh=PR_PSSH(pssh_b64), pssh_b64=pssh_b64)
-                    drm_list.append(drm)
-
-            if drm_list:
-                self.drm = drm_list
-                self.needs_drm_loading = False
-                return True
-
-        except Exception as e:
-            raise ValueError(f"Failed to load DRM from playlist for track {self.id}: {e}")
-
-        return False
-
     def get_init_segment(
         self,
         maximum_size: int = 20000,
@@ -644,32 +567,15 @@ class Track:
         output_path = original_path.with_stem(f"{original_path.stem}_repack")
 
         def _ffmpeg(extra_args: list[str] = None):
-            args = [
-                binaries.FFMPEG,
-                "-hide_banner",
-                "-loglevel",
-                "error",
-                "-i",
-                original_path,
-                *(extra_args or []),
-            ]
-
-            if hasattr(self, "data") and self.data.get("audio_language"):
-                audio_lang = self.data["audio_language"]
-                audio_name = self.data.get("audio_language_name", audio_lang)
-                args.extend(
-                    [
-                        "-metadata:s:a:0",
-                        f"language={audio_lang}",
-                        "-metadata:s:a:0",
-                        f"title={audio_name}",
-                        "-metadata:s:a:0",
-                        f"handler_name={audio_name}",
-                    ]
-                )
-
-            args.extend(
+            subprocess.run(
                 [
+                    binaries.FFMPEG,
+                    "-hide_banner",
+                    "-loglevel",
+                    "error",
+                    "-i",
+                    original_path,
+                    *(extra_args or []),
                     # Following are very important!
                     "-map_metadata",
                     "-1",  # don't transfer metadata to output file
@@ -678,11 +584,7 @@ class Track:
                     "-codec",
                     "copy",
                     str(output_path),
-                ]
-            )
-
-            subprocess.run(
-                args,
+                ],
                 check=True,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,

unshackle/core/tracks/tracks.py

@@ -305,14 +305,7 @@ class Tracks:
             )
         return selected
 
-    def mux(
-        self,
-        title: str,
-        delete: bool = True,
-        progress: Optional[partial] = None,
-        audio_expected: bool = True,
-        title_language: Optional[Language] = None,
-    ) -> tuple[Path, int, list[str]]:
+    def mux(self, title: str, delete: bool = True, progress: Optional[partial] = None) -> tuple[Path, int, list[str]]:
         """
         Multiplex all the Tracks into a Matroska Container file.
 
@@ -322,28 +315,7 @@ class Tracks:
             delete: Delete all track files after multiplexing.
             progress: Update a rich progress bar via `completed=...`. This must be the
                 progress object's update() func, pre-set with task id via functools.partial.
-            audio_expected: Whether audio is expected in the output. Used to determine
-                if embedded audio metadata should be added.
-            title_language: The title's intended language. Used to select the best video track
-                for audio metadata when multiple video tracks exist.
         """
-        if self.videos and not self.audio and audio_expected:
-            video_track = None
-            if title_language:
-                video_track = next((v for v in self.videos if v.language == title_language), None)
-                if not video_track:
-                    video_track = next((v for v in self.videos if v.is_original_lang), None)
-
-            video_track = video_track or self.videos[0]
-            if video_track.language.is_valid():
-                lang_code = str(video_track.language)
-                lang_name = video_track.language.display_name()
-
-                for video in self.videos:
-                    video.needs_repack = True
-                    video.data["audio_language"] = lang_code
-                    video.data["audio_language_name"] = lang_name
-
         if not binaries.MKVToolNix:
             raise RuntimeError("MKVToolNix (mkvmerge) is required for muxing but was not found")
 
@@ -360,20 +332,12 @@ class Tracks:
                 raise ValueError("Video Track must be downloaded before muxing...")
             events.emit(events.Types.TRACK_MULTIPLEX, track=vt)
 
-            is_default = False
-            if title_language:
-                is_default = vt.language == title_language
-                if not any(v.language == title_language for v in self.videos):
-                    is_default = vt.is_original_lang or i == 0
-            else:
-                is_default = i == 0
-
             # Prepare base arguments
             video_args = [
                 "--language",
                 f"0:{vt.language}",
                 "--default-track",
-                f"0:{is_default}",
+                f"0:{i == 0}",
                 "--original-flag",
                 f"0:{vt.is_original_lang}",
                 "--compression",
@@ -399,18 +363,6 @@ class Tracks:
                     ]
                 )
 
-            if hasattr(vt, "data") and vt.data.get("audio_language"):
-                audio_lang = vt.data["audio_language"]
-                audio_name = vt.data.get("audio_language_name", audio_lang)
-                video_args.extend(
-                    [
-                        "--language",
-                        f"1:{audio_lang}",
-                        "--track-name",
-                        f"1:{audio_name}",
-                    ]
-                )
-
             cl.extend(video_args + ["(", str(vt.path), ")"])
 
         for i, at in enumerate(self.audio):

unshackle/core/utilities.py

@@ -20,6 +20,7 @@ import requests
 from construct import ValidationError
 from langcodes import Language, closest_match
 from pymp4.parser import Box
+from requests.adapters import HTTPAdapter
 from unidecode import unidecode
 
 from unshackle.core.cacher import Cacher
@@ -99,9 +100,9 @@ def sanitize_filename(filename: str, spacer: str = ".") -> str:
     # remove or replace further characters as needed
     filename = "".join(c for c in filename if unicodedata.category(c) != "Mn")  # hidden characters
     filename = filename.replace("/", " & ").replace(";", " & ")  # e.g. multi-episode filenames
-    filename = re.sub(r"[:; ]", spacer, filename)  # structural chars to (spacer)
-    filename = re.sub(r"[\\*!?¿,'\"" "()<>|$#~]", "", filename)  # not filename safe chars
-    filename = re.sub(rf"[{spacer}]{{2,}}", spacer, filename)  # remove extra neighbouring (spacer)s
+    filename = re.sub(r"[;]", spacer, filename)  # structural chars to (spacer)
+    filename = re.sub(r"[\\:*!?¿,'\"""<>|$#~]", "", filename)  # not filename safe chars
+    # filename = re.sub(rf"[{spacer}]{{2,}}", spacer, filename)  # remove extra neighbouring (spacer)s
 
     return filename
 
@@ -241,7 +242,10 @@ def get_ip_info(session: Optional[requests.Session] = None) -> dict:
     If you provide a Requests Session with a Proxy, that proxies IP information
     is what will be returned.
     """
-    return (session or requests.Session()).get("https://ipinfo.io/json").json()
+    request = session or requests.Session()
+    request.adapters["http://"] = HTTPAdapter(max_retries=3)
+    request.adapters["https://"] = HTTPAdapter(max_retries=3)
+    return request.get("https://ipinfo.io/json", timeout=3).json()
 
 
 def get_cached_ip_info(session: Optional[requests.Session] = None) -> Optional[dict]:

unshackle/core/vaults.py

@@ -74,9 +74,7 @@ class Vaults:
         for vault in self.vaults:
             if not vault.no_push:
                 try:
-                    # Count each vault that successfully processes the keys (whether new or existing)
-                    vault.add_keys(self.service, kid_keys)
-                    success += 1
+                    success += bool(vault.add_keys(self.service, kid_keys))
                 except (PermissionError, NotImplementedError):
                     pass
         return success

unshackle/services/Netflix/MSL/MSLKeys.py

@@ -0,0 +1,10 @@
+from .MSLObject import MSLObject
+
+
+class MSLKeys(MSLObject):
+    def __init__(self, encryption=None, sign=None, rsa=None, mastertoken=None, cdm_session=None):
+        self.encryption = encryption
+        self.sign = sign
+        self.rsa = rsa
+        self.mastertoken = mastertoken
+        self.cdm_session = cdm_session

unshackle/services/Netflix/MSL/MSLObject.py

@@ -0,0 +1,6 @@
+import jsonpickle
+
+
+class MSLObject:
+    def __repr__(self):
+        return "<{} {}>".format(self.__class__.__name__, jsonpickle.encode(self, unpicklable=False))

unshackle/services/Netflix/MSL/__init__.py

@@ -0,0 +1,416 @@
+import base64
+import gzip
+import json
+import logging
+import os
+import random
+import re
+import sys
+import time
+import zlib
+from datetime import datetime
+from io import BytesIO
+from typing import Optional, Any
+
+import jsonpickle
+import requests
+from Cryptodome.Cipher import AES, PKCS1_OAEP
+from Cryptodome.Hash import HMAC, SHA256
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Random import get_random_bytes
+from Cryptodome.Util import Padding
+
+from unshackle.core.cacher import Cacher
+
+from .MSLKeys import MSLKeys
+from .schemes import EntityAuthenticationSchemes  # noqa: F401
+from .schemes import KeyExchangeSchemes
+from .schemes.EntityAuthentication import EntityAuthentication
+from .schemes.KeyExchangeRequest import KeyExchangeRequest
+from pywidevine import Cdm, PSSH, Key
+
+class MSL:
+    log = logging.getLogger("MSL")
+
+    def __init__(self, session, endpoint, sender, keys, message_id, user_auth=None):
+        self.session = session
+        self.endpoint = endpoint
+        self.sender = sender
+        self.keys = keys
+        self.user_auth = user_auth
+        self.message_id = message_id
+
+    @classmethod
+    def handshake(cls, scheme: KeyExchangeSchemes, session: requests.Session, endpoint: str, sender: str, cache: Cacher, cdm: Optional[Cdm] = None, config: Any = None):
+        cache = cache.get(sender)
+        message_id = random.randint(0, pow(2, 52))
+        msl_keys = MSL.load_cache_data(cache)
+
+        if msl_keys is not None:
+            cls.log.info("Using cached MSL data")
+        else:
+            msl_keys = MSLKeys()
+            if scheme != KeyExchangeSchemes.Widevine:
+                msl_keys.rsa = RSA.generate(2048)
+
+
+            if scheme == KeyExchangeSchemes.Widevine:
+                if not cdm:
+                    raise Exception('Key exchange scheme Widevine but CDM instance is None.')
+                
+                session_id = cdm.open()
+                msl_keys.cdm_session = session_id
+                cdm.set_service_certificate(session_id, config["certificate"])
+                challenge = cdm.get_license_challenge(
+                    session_id=session_id,
+                    pssh=PSSH("AAAANHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABQIARIQAAAAAAPSZ0kAAAAAAAAAAA=="),
+                    license_type="OFFLINE",
+                    privacy_mode=True,
+
+                )
+                keyrequestdata = KeyExchangeRequest.Widevine(challenge)
+                entityauthdata = EntityAuthentication.Unauthenticated(sender)
+                # entityauthdata = EntityAuthentication.Widevine("TV", base64.b64encode(challenge).decode())
+            else:
+                entityauthdata = EntityAuthentication.Unauthenticated(sender)
+                keyrequestdata = KeyExchangeRequest.AsymmetricWrapped(
+                    keypairid="superKeyPair",
+                    mechanism="JWK_RSA",
+                    publickey=msl_keys.rsa.publickey().exportKey(format="DER")
+                )
+
+            data = jsonpickle.encode({
+                "entityauthdata": entityauthdata,
+                "headerdata": base64.b64encode(MSL.generate_msg_header(
+                    message_id=message_id,
+                    sender=sender,
+                    is_handshake=True,
+                    keyrequestdata=keyrequestdata
+                ).encode("utf-8")).decode("utf-8"),
+                "signature": ""
+            }, unpicklable=False)
+            data += json.dumps({
+                "payload": base64.b64encode(json.dumps({
+                    "messageid": message_id,
+                    "data": "",
+                    "sequencenumber": 1,
+                    "endofmsg": True
+                }).encode("utf-8")).decode("utf-8"),
+                "signature": ""
+            })
+
+            try:
+                r = session.post(
+                    url=endpoint,
+                    data=data
+                )
+            except requests.HTTPError as e:
+                raise Exception(f"- Key exchange failed, response data is unexpected: {e.response.text}")
+
+            key_exchange = r.json()  # expecting no payloads, so this is fine
+            if "errordata" in key_exchange:
+                raise Exception("- Key exchange failed: " + json.loads(base64.b64decode(
+                    key_exchange["errordata"]
+                ).decode())["errormsg"])
+
+            # parse the crypto keys
+            key_response_data = json.JSONDecoder().decode(base64.b64decode(
+                key_exchange["headerdata"]
+            ).decode("utf-8"))["keyresponsedata"]
+
+            if key_response_data["scheme"] != str(scheme):
+                raise Exception("- Key exchange scheme mismatch occurred")
+
+            key_data = key_response_data["keydata"]
+            if scheme == KeyExchangeSchemes.Widevine:
+                if not msl_keys.cdm_session:
+                    raise Exception("- No CDM session available")
+                if not cdm:
+                    raise Exception("- No CDM available")
+                cdm.parse_license(msl_keys.cdm_session, key_data["cdmkeyresponse"])
+                keys = cdm.get_keys(msl_keys.cdm_session)
+                cls.log.info(f"Keys: {keys}")
+                encryption_key = MSL.get_widevine_key(
+                    kid=base64.b64decode(key_data["encryptionkeyid"]),
+                    keys=keys,
+                    permissions=["allow_encrypt", "allow_decrypt"]
+                )
+                msl_keys.encryption = encryption_key
+                cls.log.info(f"Encryption key: {encryption_key}")
+                sign = MSL.get_widevine_key(
+                    kid=base64.b64decode(key_data["hmackeyid"]),
+                    keys=keys,
+                    permissions=["allow_sign", "allow_signature_verify"]
+                )
+                cls.log.info(f"Sign key: {sign}")
+                msl_keys.sign = sign
+            
+            elif scheme == KeyExchangeSchemes.AsymmetricWrapped:
+                cipher_rsa = PKCS1_OAEP.new(msl_keys.rsa)
+                msl_keys.encryption = MSL.base64key_decode(
+                    json.JSONDecoder().decode(cipher_rsa.decrypt(
+                        base64.b64decode(key_data["encryptionkey"])
+                    ).decode("utf-8"))["k"]
+                )
+                msl_keys.sign = MSL.base64key_decode(
+                    json.JSONDecoder().decode(cipher_rsa.decrypt(
+                        base64.b64decode(key_data["hmackey"])
+                    ).decode("utf-8"))["k"]
+                )
+            
+            msl_keys.mastertoken = key_response_data["mastertoken"]
+
+            MSL.cache_keys(msl_keys, cache)
+            cls.log.info("MSL handshake successful")
+        return cls(
+            session=session,
+            endpoint=endpoint,
+            sender=sender,
+            keys=msl_keys,
+            message_id=message_id
+        )
+
+    @staticmethod
+    def load_cache_data(cacher: Cacher):
+        if not cacher or cacher == {}:
+            return None
+        # with open(msl_keys_path, encoding="utf-8") as fd:
+        #     msl_keys = jsonpickle.decode(fd.read())
+        msl_keys = cacher.data
+        if msl_keys.rsa:
+            # noinspection PyTypeChecker
+            # expects RsaKey, but is a string, this is because jsonpickle can't pickle RsaKey object
+            # so as a workaround it exports to PEM, and then when reading, it imports that PEM back
+            # to an RsaKey :)
+            msl_keys.rsa = RSA.importKey(msl_keys.rsa)
+        # If it's expired or close to, return None as it's unusable
+        if msl_keys.mastertoken and ((datetime.utcfromtimestamp(int(json.JSONDecoder().decode(
+                base64.b64decode(msl_keys.mastertoken["tokendata"]).decode("utf-8")
+        )["expiration"])) - datetime.now()).total_seconds() / 60 / 60) < 10:
+            return None
+        return msl_keys
+
+    @staticmethod
+    def cache_keys(msl_keys, cache: Cacher):
+        # os.makedirs(os.path.dirname(cache), exist_ok=True)
+        if msl_keys.rsa:
+            # jsonpickle can't pickle RsaKey objects :(
+            msl_keys.rsa = msl_keys.rsa.export_key()
+        # with open(cache, "w", encoding="utf-8") as fd:
+        #     fd.write()
+        cache.set(msl_keys)
+        if msl_keys.rsa:
+            # re-import now
+            msl_keys.rsa = RSA.importKey(msl_keys.rsa)
+
+    @staticmethod
+    def generate_msg_header(message_id, sender, is_handshake, userauthdata=None, keyrequestdata=None,
+                            compression="GZIP"):
+        """
+        The MSL header carries all MSL data used for entity and user authentication, message encryption
+        and verification, and service tokens. Portions of the MSL header are encrypted.
+        https://github.com/Netflix/msl/wiki/Messages#header-data
+
+        :param message_id: number against which payload chunks are bound to protect against replay.
+        :param sender: ESN
+        :param is_handshake: This flag is set true if the message is a handshake message and will not include any
+        payload chunks. It will include keyrequestdata.
+        :param userauthdata: UserAuthData
+        :param keyrequestdata: KeyRequestData
+        :param compression: Supported compression algorithms.
+
+        :return: The base64 encoded JSON String of the header
+        """
+        header_data = {
+            "messageid": message_id,
+            "renewable": True,  # MUST be True if is_handshake
+            "handshake": is_handshake,
+            "capabilities": {
+                "compressionalgos": [compression] if compression else [],
+                "languages": ["en-US"],  # bcp-47
+                "encoderformats": ["JSON"]
+            },
+            "timestamp": int(time.time()),
+            # undocumented or unused:
+            "sender": sender,
+            "nonreplayable": False,
+            "recipient": "Netflix",
+        }
+        if userauthdata:
+            header_data["userauthdata"] = userauthdata
+        if keyrequestdata:
+            header_data["keyrequestdata"] = [keyrequestdata]
+        return jsonpickle.encode(header_data, unpicklable=False)
+
+    @classmethod
+    def get_widevine_key(cls, kid, keys: list[Key], permissions):
+        cls.log.info(f"KID: {Key.kid_to_uuid(kid)}")
+        for key in keys:
+            # cls.log.info(f"KEY: {key.kid_to_uuid}")
+            if key.kid != Key.kid_to_uuid(kid):
+                continue
+            if key.type != "OPERATOR_SESSION":
+                cls.log.warning(f"Widevine Key Exchange: Wrong key type (not operator session) key {key}")
+                continue
+            if not set(permissions) <= set(key.permissions):
+                cls.log.warning(f"Widevine Key Exchange: Incorrect permissions, key {key}, needed perms {permissions}")
+                continue
+            return key.key
+        return None
+
+    def send_message(self, endpoint, params, application_data, userauthdata=None):
+        message = self.create_message(application_data, userauthdata)
+        res = self.session.post(url=endpoint, data=message, params=params)
+        header, payload_data = self.parse_message(res.text)
+        if "errordata" in header:
+            raise Exception(
+                "- MSL response message contains an error: {}".format(
+                    json.loads(base64.b64decode(header["errordata"].encode("utf-8")).decode("utf-8"))
+                )
+            )
+        return header, payload_data
+
+    def create_message(self, application_data, userauthdata=None):
+        self.message_id += 1  # new message must ue a new message id
+        headerdata = self.encrypt(self.generate_msg_header(
+            message_id=self.message_id,
+            sender=self.sender,
+            is_handshake=False,
+            userauthdata=userauthdata
+        ))
+
+        header = json.dumps({
+            "headerdata": base64.b64encode(headerdata.encode("utf-8")).decode("utf-8"),
+            "signature": self.sign(headerdata).decode("utf-8"),
+            "mastertoken": self.keys.mastertoken
+        })
+
+        payload_chunks = [self.encrypt(json.dumps({
+            "messageid": self.message_id,
+            "data": self.gzip_compress(json.dumps(application_data).encode("utf-8")).decode("utf-8"),
+            "compressionalgo": "GZIP",
+            "sequencenumber": 1,  # todo ; use sequence_number from master token instead?
+            "endofmsg": True
+        }))]
+
+        message = header
+        for payload_chunk in payload_chunks:
+            message += json.dumps({
+                "payload": base64.b64encode(payload_chunk.encode("utf-8")).decode("utf-8"),
+                "signature": self.sign(payload_chunk).decode("utf-8")
+            })
+
+        return message
+
+    def decrypt_payload_chunks(self, payload_chunks):
+        """
+        Decrypt and extract data from payload chunks
+
+        :param payload_chunks: List of payload chunks
+        :return: json object
+        """
+        raw_data = ""
+
+        for payload_chunk in payload_chunks:
+            # todo ; verify signature of payload_chunk["signature"] against payload_chunk["payload"]
+            # expecting base64-encoded json string
+            payload_chunk = json.loads(base64.b64decode(payload_chunk["payload"]).decode("utf-8"))
+            # decrypt the payload
+            payload_decrypted = AES.new(
+                key=self.keys.encryption,
+                mode=AES.MODE_CBC,
+                iv=base64.b64decode(payload_chunk["iv"])
+            ).decrypt(base64.b64decode(payload_chunk["ciphertext"]))
+            payload_decrypted = Padding.unpad(payload_decrypted, 16)
+            payload_decrypted = json.loads(payload_decrypted.decode("utf-8"))
+            # decode and uncompress data if compressed
+            payload_data = base64.b64decode(payload_decrypted["data"])
+            if payload_decrypted.get("compressionalgo") == "GZIP":
+                payload_data = zlib.decompress(payload_data, 16 + zlib.MAX_WBITS)
+            raw_data += payload_data.decode("utf-8")
+
+        data = json.loads(raw_data)
+        if "error" in data:
+            error = data["error"]
+            error_display = error.get("display")
+            error_detail = re.sub(r" \(E3-[^)]+\)", "", error.get("detail", ""))
+
+            if error_display:
+               self.log.critical(f"- {error_display}")
+            if error_detail:
+               self.log.critical(f"- {error_detail}")
+
+            if not (error_display or error_detail):
+                self.log.critical(f"- {error}")
+
+            # sys.exit(1)
+
+        return data["result"]
+
+    def parse_message(self, message):
+        """
+        Parse an MSL message into a header and list of payload chunks
+
+        :param message: MSL message
+        :returns: a 2-item tuple containing message and list of payload chunks if available
+        """
+        parsed_message = json.loads("[{}]".format(message.replace("}{", "},{")))
+
+        header = parsed_message[0]
+        encrypted_payload_chunks = parsed_message[1:] if len(parsed_message) > 1 else []
+        if encrypted_payload_chunks:
+            payload_chunks = self.decrypt_payload_chunks(encrypted_payload_chunks)
+        else:
+            payload_chunks = {}
+
+        return header, payload_chunks
+
+    @staticmethod
+    def gzip_compress(data):
+        out = BytesIO()
+        with gzip.GzipFile(fileobj=out, mode="w") as fd:
+            fd.write(data)
+        return base64.b64encode(out.getvalue())
+
+    @staticmethod
+    def base64key_decode(payload):
+        length = len(payload) % 4
+        if length == 2:
+            payload += "=="
+        elif length == 3:
+            payload += "="
+        elif length != 0:
+            raise ValueError("Invalid base64 string")
+        return base64.urlsafe_b64decode(payload.encode("utf-8"))
+
+    def encrypt(self, plaintext):
+        """
+        Encrypt the given Plaintext with the encryption key
+        :param plaintext:
+        :return: Serialized JSON String of the encryption Envelope
+        """
+        iv = get_random_bytes(16)
+        return json.dumps({
+            "ciphertext": base64.b64encode(
+                AES.new(
+                    self.keys.encryption,
+                    AES.MODE_CBC,
+                    iv
+                ).encrypt(
+                    Padding.pad(plaintext.encode("utf-8"), 16)
+                )
+            ).decode("utf-8"),
+            "keyid": "{}_{}".format(self.sender, json.loads(
+                base64.b64decode(self.keys.mastertoken["tokendata"]).decode("utf-8")
+            )["sequencenumber"]),
+            "sha256": "AA==",
+            "iv": base64.b64encode(iv).decode("utf-8")
+        })
+
+    def sign(self, text):
+        """
+        Calculates the HMAC signature for the given text with the current sign key and SHA256
+        :param text:
+        :return: Base64 encoded signature
+        """
+        return base64.b64encode(HMAC.new(self.keys.sign, text.encode("utf-8"), SHA256).digest())

unshackle/services/Netflix/MSL/schemes/EntityAuthentication.py

@@ -0,0 +1,59 @@
+from .. import EntityAuthenticationSchemes
+from ..MSLObject import MSLObject
+
+
+# noinspection PyPep8Naming
+class EntityAuthentication(MSLObject):
+    def __init__(self, scheme, authdata):
+        """
+        Data used to identify and authenticate the entity associated with a message.
+        https://github.com/Netflix/msl/wiki/Entity-Authentication-%28Configuration%29
+
+        :param scheme: Entity Authentication Scheme identifier
+        :param authdata: Entity Authentication data
+        """
+        self.scheme = str(scheme)
+        self.authdata = authdata
+
+    @classmethod
+    def Unauthenticated(cls, identity):
+        """
+        The unauthenticated entity authentication scheme does not provide encryption or authentication and only
+        identifies the entity. Therefore entity identities can be harvested and spoofed. The benefit of this
+        authentication scheme is that the entity has control over its identity. This may be useful if the identity is
+        derived from or related to other data, or if retaining the identity is desired across state resets or in the
+        event of MSL errors requiring entity re-authentication.
+        """
+        return cls(
+            scheme=EntityAuthenticationSchemes.Unauthenticated,
+            authdata={"identity": identity}
+        )
+
+    @classmethod
+    def Widevine(cls, devtype, keyrequest):
+        """
+        The Widevine entity authentication scheme is used by devices with the Widevine CDM. It does not provide
+        encryption or authentication and only identifies the entity. Therefore entity identities can be harvested
+        and spoofed. The entity identity is composed from the provided device type and Widevine key request data. The
+        Widevine CDM properties can be extracted from the key request data.
+
+        When coupled with the Widevine key exchange scheme, the entity identity can be cryptographically validated by
+        comparing the entity authentication key request data against the key exchange key request data.
+
+        Note that the local entity will not know its entity identity when using this scheme.
+
+        > Devtype
+
+        An arbitrary value identifying the device type the local entity wishes to assume. The data inside the Widevine
+        key request may be optionally used to validate the claimed device type.
+
+        :param devtype: Local entity device type
+        :param keyrequest: Widevine key request
+        """
+        return cls(
+            scheme=EntityAuthenticationSchemes.Widevine,
+            authdata={
+                "devtype": devtype,
+                "keyrequest": keyrequest
+            }
+        )

unshackle/services/Netflix/MSL/schemes/KeyExchangeRequest.py

@@ -0,0 +1,80 @@
+import base64
+
+from .. import KeyExchangeSchemes
+from ..MSLObject import MSLObject
+
+
+# noinspection PyPep8Naming
+class KeyExchangeRequest(MSLObject):
+    def __init__(self, scheme, keydata):
+        """
+        Session key exchange data from a requesting entity.
+        https://github.com/Netflix/msl/wiki/Key-Exchange-%28Configuration%29
+
+        :param scheme: Key Exchange Scheme identifier
+        :param keydata: Key Request data
+        """
+        self.scheme = str(scheme)
+        self.keydata = keydata
+
+    @classmethod
+    def AsymmetricWrapped(cls, keypairid, mechanism, publickey):
+        """
+        Asymmetric wrapped key exchange uses a generated ephemeral asymmetric key pair for key exchange. It will
+        typically be used when there is no other data or keys from which to base secure key exchange.
+
+        This mechanism provides perfect forward secrecy but does not guarantee that session keys will only be available
+        to the requesting entity if the requesting MSL stack has been modified to perform the operation on behalf of a
+        third party.
+
+        > Key Pair ID
+
+        The key pair ID is included as a sanity check.
+
+        > Mechanism & Public Key
+
+        The following mechanisms are associated public key formats are currently supported.
+
+            Field 	    Public  Key Format 	Description
+            RSA 	    SPKI 	RSA-OAEP    encrypt/decrypt
+            ECC 	    SPKI 	ECIES       encrypt/decrypt
+            JWEJS_RSA 	SPKI 	RSA-OAEP    JSON Web Encryption JSON Serialization
+            JWE_RSA 	SPKI 	RSA-OAEP    JSON Web Encryption Compact Serialization
+            JWK_RSA 	SPKI 	RSA-OAEP    JSON Web Key
+            JWK_RSAES 	SPKI 	RSA PKCS#1  JSON Web Key
+
+        :param keypairid: key pair ID
+        :param mechanism: asymmetric key type
+        :param publickey: public key
+        """
+        return cls(
+            scheme=KeyExchangeSchemes.AsymmetricWrapped,
+            keydata={
+                "keypairid": keypairid,
+                "mechanism": mechanism,
+                "publickey": base64.b64encode(publickey).decode("utf-8")
+            }
+        )
+
+    @classmethod
+    def Widevine(cls, keyrequest):
+        """
+        Google Widevine provides a secure key exchange mechanism. When requested the Widevine component will issue a
+        one-time use key request. The Widevine server library can be used to authenticate the request and return
+        randomly generated symmetric keys in a protected key response bound to the request and Widevine client library.
+        The key response also specifies the key identities, types and their permitted usage.
+
+        The Widevine key request also contains a model identifier and a unique device identifier with an expectation of
+        long-term persistence. These values are available from the Widevine client library and can be retrieved from
+        the key request by the Widevine server library.
+
+        The Widevine client library will protect the returned keys from inspection or misuse.
+
+        :param keyrequest: Base64-encoded Widevine CDM license challenge (PSSH: b'\x0A\x7A\x00\x6C\x38\x2B')
+        """
+        if not isinstance(keyrequest, str):
+            keyrequest = base64.b64encode(keyrequest).decode()
+        return cls(
+            scheme=KeyExchangeSchemes.Widevine,
+            keydata={"keyrequest": keyrequest}
+        )

unshackle/services/Netflix/MSL/schemes/UserAuthentication.py

@@ -0,0 +1,59 @@
+from ..MSLObject import MSLObject
+from . import UserAuthenticationSchemes
+
+
+# noinspection PyPep8Naming
+class UserAuthentication(MSLObject):
+    def __init__(self, scheme, authdata):
+        """
+        Data used to identify and authenticate the user associated with a message.
+        https://github.com/Netflix/msl/wiki/User-Authentication-%28Configuration%29
+
+        :param scheme: User Authentication Scheme identifier
+        :param authdata: User Authentication data
+        """
+        self.scheme = str(scheme)
+        self.authdata = authdata
+
+    @classmethod
+    def EmailPassword(cls, email, password):
+        """
+        Email and password is a standard user authentication scheme in wide use.
+
+        :param email: user email address
+        :param password: user password
+        """
+        return cls(
+            scheme=UserAuthenticationSchemes.EmailPassword,
+            authdata={
+                "email": email,
+                "password": password
+            }
+        )
+
+    @classmethod
+    def NetflixIDCookies(cls, netflixid, securenetflixid):
+        """
+        Netflix ID HTTP cookies are used when the user has previously logged in to a web site. Possession of the
+        cookies serves as proof of user identity, in the same manner as they do when communicating with the web site.
+
+        The Netflix ID cookie and Secure Netflix ID cookie are HTTP cookies issued by the Netflix web site after
+        subscriber login. The Netflix ID cookie is encrypted and identifies the subscriber and analogous to a
+        subscriber’s username. The Secure Netflix ID cookie is tied to a Netflix ID cookie and only sent over HTTPS
+        and analogous to a subscriber’s password.
+
+        In some cases the Netflix ID and Secure Netflix ID cookies will be unavailable to the MSL stack or application.
+        If either or both of the Netflix ID or Secure Netflix ID cookies are absent in the above data structure the
+        HTTP cookie headers will be queried for it; this is only acceptable when HTTPS is used as the underlying
+        transport protocol.
+
+        :param netflixid: Netflix ID cookie
+        :param securenetflixid: Secure Netflix ID cookie
+        """
+        return cls(
+            scheme=UserAuthenticationSchemes.NetflixIDCookies,
+            authdata={
+                "netflixid": netflixid,
+                "securenetflixid": securenetflixid
+            }
+        )

unshackle/services/Netflix/MSL/schemes/__init__.py

@@ -0,0 +1,24 @@
+from enum import Enum
+
+
+class Scheme(Enum):
+    def __str__(self):
+        return str(self.value)
+
+
+class EntityAuthenticationSchemes(Scheme):
+    """https://github.com/Netflix/msl/wiki/Entity-Authentication-%28Configuration%29"""
+    Unauthenticated = "NONE"
+    Widevine = "WIDEVINE"
+
+
+class UserAuthenticationSchemes(Scheme):
+    """https://github.com/Netflix/msl/wiki/User-Authentication-%28Configuration%29"""
+    EmailPassword = "EMAIL_PASSWORD"
+    NetflixIDCookies = "NETFLIXID"
+
+
+class KeyExchangeSchemes(Scheme):
+    """https://github.com/Netflix/msl/wiki/Key-Exchange-%28Configuration%29"""
+    AsymmetricWrapped = "ASYMMETRIC_WRAPPED"
+    Widevine = "WIDEVINE"

unshackle/unshackle-example.yaml

@@ -88,26 +88,6 @@ cdm:
     jane_uhd: nexus_5_l1 # Profile 'jane_uhd' uses Nexus 5 L1
     default: generic_android_l3 # Default CDM for this service
 
-  # NEW: Quality-based CDM selection
-  # Use different CDMs based on video resolution
-  # Supports operators: >=, >, <=, <, or exact match
-  EXAMPLE_QUALITY:
-    "<=1080": generic_android_l3 # Use L3 for 1080p and below
-    ">1080": nexus_5_l1 # Use L1 for above 1080p (1440p, 2160p)
-    default: generic_android_l3 # Optional: fallback if no quality match
-
-  # You can mix profiles and quality thresholds in the same service
-  NETFLIX:
-    # Profile-based selection (existing functionality)
-    john: netflix_l3_profile
-    jane: netflix_l1_profile
-    # Quality-based selection (new functionality)
-    "<=720": netflix_mobile_l3
-    "1080": netflix_standard_l3
-    ">=1440": netflix_premium_l1
-    # Fallback
-    default: netflix_standard_l3
-
 # Use pywidevine Serve-compliant Remote CDMs
 remote_cdm:
   - name: "chrome"
@@ -126,16 +106,16 @@ remote_cdm:
     secret: secret_key
 
   - name: "decrypt_labs_chrome"
-    type: "decrypt_labs" # Required to identify as DecryptLabs CDM
-    device_name: "ChromeCDM" # Scheme identifier - must match exactly
+    type: "decrypt_labs"  # Required to identify as DecryptLabs CDM
+    device_name: "ChromeCDM"  # Scheme identifier - must match exactly
     device_type: CHROME
     system_id: 4464 # Doesn't matter
     security_level: 3
     host: "https://keyxtractor.decryptlabs.com"
-    secret: "your_decrypt_labs_api_key_here" # Replace with your API key
+    secret: "your_decrypt_labs_api_key_here"  # Replace with your API key
   - name: "decrypt_labs_l1"
     type: "decrypt_labs"
-    device_name: "L1" # Scheme identifier - must match exactly
+    device_name: "L1"  # Scheme identifier - must match exactly
     device_type: ANDROID
     system_id: 4464
     security_level: 1
@@ -144,7 +124,7 @@ remote_cdm:
 
   - name: "decrypt_labs_l2"
     type: "decrypt_labs"
-    device_name: "L2" # Scheme identifier - must match exactly
+    device_name: "L2"  # Scheme identifier - must match exactly
     device_type: ANDROID
     system_id: 4464
     security_level: 2
@@ -153,7 +133,7 @@ remote_cdm:
 
   - name: "decrypt_labs_playready_sl2"
     type: "decrypt_labs"
-    device_name: "SL2" # Scheme identifier - must match exactly
+    device_name: "SL2"  # Scheme identifier - must match exactly
     device_type: PLAYREADY
     system_id: 0
     security_level: 2000
@@ -162,7 +142,7 @@ remote_cdm:
 
   - name: "decrypt_labs_playready_sl3"
     type: "decrypt_labs"
-    device_name: "SL3" # Scheme identifier - must match exactly
+    device_name: "SL3"  # Scheme identifier - must match exactly
     device_type: PLAYREADY
     system_id: 0
     security_level: 3000

unshackle/unshackle.yaml

@@ -0,0 +1,253 @@
+# Group or Username to postfix to the end of all download filenames following a dash
+tag: Kenzuya
+
+# Enable/disable tagging with group name (default: true)
+tag_group_name: true
+
+# Enable/disable tagging with IMDB/TMDB/TVDB details (default: true)
+tag_imdb_tmdb: true
+
+# Set terminal background color (custom option not in CONFIG.md)
+set_terminal_bg: false
+
+# Set file naming convention
+#  true for style - Prime.Suspect.S07E01.The.Final.Act.Part.One.1080p.ITV.WEB-DL.AAC2.0.H.264
+#  false for style - Prime Suspect S07E01 The Final Act - Part One
+scene_naming: true
+
+# Whether to include the year in series names for episodes and folders (default: true)
+#  true for style - Show Name (2023) S01E01 Episode Name
+#  false for style - Show Name S01E01 Episode Name
+series_year: false
+
+# Check for updates from GitHub repository on startup (default: true)
+update_checks: true
+
+# How often to check for updates, in hours (default: 24)
+update_check_interval: 24
+
+# Title caching configuration
+# Cache title metadata to reduce redundant API calls
+title_cache_enabled: true # Enable/disable title caching globally (default: true)
+title_cache_time: 1800 # Cache duration in seconds (default: 1800 = 30 minutes)
+title_cache_max_retention: 86400 # Maximum cache retention for fallback when API fails (default: 86400 = 24 hours)
+
+# Muxing configuration
+muxing:
+  set_title: true
+
+# Login credentials for each Service
+credentials:
+  # Direct credentials (no profile support)
+  EXAMPLE: email@example.com:password
+
+  # Per-profile credentials with default fallback
+  SERVICE_NAME:
+    default: default@email.com:password # Used when no -p/--profile is specified
+    profile1: user1@email.com:password1
+    profile2: user2@email.com:password2
+
+  # Per-profile credentials without default (requires -p/--profile)
+  SERVICE_NAME2:
+    john: john@example.com:johnspassword
+    jane: jane@example.com:janespassword
+
+  # You can also use list format for passwords with special characters
+  SERVICE_NAME3:
+    default: ["user@email.com", ":PasswordWith:Colons"]
+  
+  Netflix:
+    default: ["sako.sako1109@gmail.com", "sako1109"]
+    # default: ["pbgarena0838@gmail.com", "Andhika1978"]
+# Override default directories used across unshackle
+directories:
+  cache: Cache
+  # cookies: Cookies
+  dcsl: DCSL # Device Certificate Status List
+  downloads: Downloads
+  logs: Logs
+  temp: Temp
+  # wvds: WVDs
+  prds: PRDs
+  # Additional directories that can be configured:
+  # commands: Commands
+  # services:
+  #   - /path/to/services
+  #   - /other/path/to/services
+  # vaults: Vaults
+  # fonts: Fonts
+
+# Pre-define which Widevine or PlayReady device to use for each Service
+cdm:
+  # Global default CDM device (fallback for all services/profiles)
+  default: chromecdm
+
+  # Direct service-specific CDM
+  DIFFERENT_EXAMPLE: PRD_1
+
+  # Per-profile CDM configuration
+  EXAMPLE:
+    john_sd: chromecdm_903_l3 # Profile 'john_sd' uses Chrome CDM L3
+    jane_uhd: nexus_5_l1 # Profile 'jane_uhd' uses Nexus 5 L1
+    default: generic_android_l3 # Default CDM for this service
+
+# Use pywidevine Serve-compliant Remote CDMs
+remote_cdm:
+  - name: "chromecdm"
+    device_name: widevine
+    device_type: CHROME
+    system_id: 36586
+    security_level: 3
+    type: "decrypt_labs"
+    host: https://keyxtractor.decryptlabs.com
+    secret: 7547150416_41da0a32d6237d83_KeyXtractor_api_ext
+  - name: "android"
+    device_name: andorid
+    device_type: ANDROID
+    system_id: 8131
+    security_level: 1
+    type: "decrypt_labs"
+    host: https://keyxtractor.decryptlabs.com
+    secret: decrypt_labs_special_ultimate
+
+# Key Vaults store your obtained Content Encryption Keys (CEKs)
+# Use 'no_push: true' to prevent a vault from receiving pushed keys
+# while still allowing it to provide keys when requested
+key_vaults:
+  - type: SQLite
+    name: Local
+    path: key_store.db
+  - type: HTTP
+    name: "DRMLab Vault"
+    host: "https://api.drmlab.io/vault/"
+    username: "unshackle"
+    password: "gEX75q7I5YVkvgF5SUkcNd41IbGrDtTT"
+    api_mode: "json"
+  # Additional vault types:
+  # - type: API
+  #   name: "Remote Vault"
+  #   uri: "https://key-vault.example.com"
+  #   token: "secret_token"
+  #   no_push: true  # This vault will only provide keys, not receive them
+  # - type: MySQL
+  #   name: "MySQL Vault"
+  #   host: "127.0.0.1"
+  #   port: 3306
+  #   database: vault
+  #   username: user
+  #   password: pass
+  #   no_push: false  # Default behavior - vault both provides and receives keys
+
+# Choose what software to use to download data
+downloader: aria2c
+# Options: requests | aria2c | curl_impersonate | n_m3u8dl_re
+# Can also be a mapping:
+# downloader:
+#   NF: requests
+#   AMZN: n_m3u8dl_re
+#   DSNP: n_m3u8dl_re
+#   default: requests
+
+# aria2c downloader configuration
+aria2c:
+  max_concurrent_downloads: 4
+  max_connection_per_server: 3
+  split: 5
+  file_allocation: falloc # none | prealloc | falloc | trunc
+
+# N_m3u8DL-RE downloader configuration
+n_m3u8dl_re:
+  thread_count: 16
+  ad_keyword: "advertisement"
+  use_proxy: true
+
+# curl_impersonate downloader configuration
+curl_impersonate:
+  browser: chrome120
+
+# Pre-define default options and switches of the dl command
+dl:
+  sub_format: srt
+  downloads: 4
+  workers: 16
+  lang:
+    - orig
+    - id
+  EXAMPLE:
+    bitrate: CBR
+
+# Chapter Name to use when exporting a Chapter without a Name
+chapter_fallback_name: "Chapter {j:02}"
+
+# Case-Insensitive dictionary of headers for all Services
+headers:
+  Accept-Language: "en-US,en;q=0.8"
+  User-Agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36"
+
+# Override default filenames used across unshackle
+filenames:
+  log: "unshackle_{name}_{time}.log"
+  config: "config.yaml"
+  root_config: "unshackle.yaml"
+  chapters: "Chapters_{title}_{random}.txt"
+  subtitle: "Subtitle_{id}_{language}.srt"
+
+# API key for The Movie Database (TMDB)
+tmdb_api_key: "8f5c14ef648a0abdd262cf809e11fcd4"
+
+# conversion_method:
+# - auto (default): Smart routing - subby for WebVTT/SAMI, standard for others
+# - subby: Always use subby with advanced processing
+# - pycaption: Use only pycaption library (no SubtitleEdit, no subby)
+# - subtitleedit: Prefer SubtitleEdit when available, fall back to pycaption
+subtitle:
+  conversion_method: auto
+  sdh_method: auto
+
+# Configuration for pywidevine's serve functionality
+serve:
+  users:
+    secret_key_for_user:
+      devices:
+        - generic_nexus_4464_l3
+      username: user
+  # devices:
+  #   - '/path/to/device.wvd'
+
+# Configuration data for each Service
+services:
+  # Service-specific configuration goes here
+  # Profile-specific configurations can be nested under service names
+
+  # Example: with profile-specific device configs
+  EXAMPLE:
+    # Global service config
+    api_key: "service_api_key"
+
+    # Profile-specific device configurations
+    profiles:
+      john_sd:
+        device:
+          app_name: "AIV"
+          device_model: "SHIELD Android TV"
+      jane_uhd:
+        device:
+          app_name: "AIV"
+          device_model: "Fire TV Stick 4K"
+
+  # Example: Service with different regions per profile
+  SERVICE_NAME:
+    profiles:
+      us_account:
+        region: "US"
+        api_endpoint: "https://api.us.service.com"
+      uk_account:
+        region: "GB"
+        api_endpoint: "https://api.uk.service.com"
+
+# External proxy provider services
+proxy_providers:
+
+  surfsharkvpn:
+    username: GyDrhk88nC53gA72EKkHBZBP  # Service credentials from https://my.surfshark.com/vpn/manual-setup/main/openvpn
+    password: 2DDwZWTfeH6XbjVxQtKJdump  # Service credentials (not your login password)

unshackle/vaults/MySQL.py

@@ -28,33 +28,26 @@ class MySQL(Vault):
             raise PermissionError(f"MySQL vault {self.slug} has no SELECT permission.")
 
     def get_key(self, kid: Union[UUID, str], service: str) -> Optional[str]:
+        if not self.has_table(service):
+            # no table, no key, simple
+            return None
+
         if isinstance(kid, UUID):
             kid = kid.hex
 
-        service_variants = [service]
-        if service != service.lower():
-            service_variants.append(service.lower())
-        if service != service.upper():
-            service_variants.append(service.upper())
-
         conn = self.conn_factory.get()
         cursor = conn.cursor()
 
         try:
-            for service_name in service_variants:
-                if not self.has_table(service_name):
-                    continue
-
-                cursor.execute(
-                    # TODO: SQL injection risk
-                    f"SELECT `id`, `key_` FROM `{service_name}` WHERE `kid`=%s AND `key_`!=%s",
-                    (kid, "0" * 32),
-                )
-                cek = cursor.fetchone()
-                if cek:
-                    return cek["key_"]
-
-            return None
+            cursor.execute(
+                # TODO: SQL injection risk
+                f"SELECT `id`, `key_` FROM `{service}` WHERE `kid`=%s AND `key_`!=%s",
+                (kid, "0" * 32),
+            )
+            cek = cursor.fetchone()
+            if not cek:
+                return None
+            return cek["key_"]
         finally:
             cursor.close()
 

unshackle/vaults/SQLite.py

@@ -19,30 +19,22 @@ class SQLite(Vault):
         self.conn_factory = ConnectionFactory(self.path)
 
     def get_key(self, kid: Union[UUID, str], service: str) -> Optional[str]:
+        if not self.has_table(service):
+            # no table, no key, simple
+            return None
+
         if isinstance(kid, UUID):
             kid = kid.hex
 
         conn = self.conn_factory.get()
         cursor = conn.cursor()
 
-        # Try both the original service name and lowercase version to handle case sensitivity issues
-        service_variants = [service]
-        if service != service.lower():
-            service_variants.append(service.lower())
-        if service != service.upper():
-            service_variants.append(service.upper())
-
         try:
-            for service_name in service_variants:
-                if not self.has_table(service_name):
-                    continue
-
-                cursor.execute(f"SELECT `id`, `key_` FROM `{service_name}` WHERE `kid`=? AND `key_`!=?", (kid, "0" * 32))
-                cek = cursor.fetchone()
-                if cek:
-                    return cek[1]
-
-            return None
+            cursor.execute(f"SELECT `id`, `key_` FROM `{service}` WHERE `kid`=? AND `key_`!=?", (kid, "0" * 32))
+            cek = cursor.fetchone()
+            if not cek:
+                return None
+            return cek[1]
         finally:
             cursor.close()
 

uv.lock

@@ -1499,7 +1499,7 @@ wheels = [
 
 [[package]]
 name = "unshackle"
-version = "1.4.6"
+version = "1.4.4"
 source = { editable = "." }
 dependencies = [
     { name = "appdirs" },