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

StreamingCommunity/Lib/Downloader/DASH/cdm_helpher.py

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

StreamingCommunity/Lib/Downloader/DASH/decrypt.py

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

StreamingCommunity/Lib/Downloader/DASH/downloader.py

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

StreamingCommunity/Lib/Downloader/DASH/parser.py

@@ -1,11 +1,13 @@
 # 25.07.25
 
+import re
 from urllib.parse import urljoin
 import xml.etree.ElementTree as ET
+from typing import List, Dict, Optional, Tuple, Any
 
 
 # External library
-import httpx
+from curl_cffi import requests
 from rich.console import Console
 
 
@@ -16,9 +18,384 @@ from StreamingCommunity.Util.config_json import config_manager
 # Variable
 console = Console()
 max_timeout = config_manager.get_int('REQUESTS', 'timeout')
+max_retry = config_manager.get_int('REQUESTS', 'max_retry')
+
+
+
+class CodecQuality:
+    """Utility class to rank codec quality"""
+    VIDEO_CODEC_RANK = {
+        'av01': 5,  # AV1
+        'vp9': 4,   # VP9
+        'vp09': 4,  # VP9
+        'hev1': 3,  # HEVC/H.265
+        'hvc1': 3,  # HEVC/H.265
+        'avc1': 2,  # H.264
+        'avc3': 2,  # H.264
+        'mp4v': 1,  # MPEG-4
+    }
+    
+    AUDIO_CODEC_RANK = {
+        'opus': 5,       # Opus
+        'mp4a.40.2': 4,  # AAC-LC
+        'mp4a.40.5': 3,  # AAC-HE
+        'mp4a': 2,       # Generic AAC
+        'ac-3': 2,       # Dolby Digital
+        'ec-3': 3,       # Dolby Digital Plus
+    }
+    
+    @staticmethod
+    def get_video_codec_rank(codec: Optional[str]) -> int:
+        """Get ranking for video codec"""
+        if not codec:
+            return 0
+        codec_lower = codec.lower()
+        for key, rank in CodecQuality.VIDEO_CODEC_RANK.items():
+            if codec_lower.startswith(key):
+                return rank
+        return 0
+    
+    @staticmethod
+    def get_audio_codec_rank(codec: Optional[str]) -> int:
+        """Get ranking for audio codec"""
+        if not codec:
+            return 0
+        codec_lower = codec.lower()
+        for key, rank in CodecQuality.AUDIO_CODEC_RANK.items():
+            if codec_lower.startswith(key):
+                return rank
+        return 0
+    
+
+class URLBuilder:
+
+    @staticmethod
+    def build_url(base: str, template: str, rep_id: Optional[str] = None, number: Optional[int] = None, time: Optional[int] = None, bandwidth: Optional[int] = None) -> str:
+        """Build absolute URL preserving query/hash"""
+        if not template:
+            return None
+
+        # Substitute RepresentationID and Bandwidth first
+        if rep_id is not None:
+            template = template.replace('$RepresentationID$', rep_id)
+        if bandwidth is not None:
+            template = template.replace('$Bandwidth$', str(bandwidth))
+
+        # Handle $Number$ with optional formatting
+        template = URLBuilder._replace_number(template, number)
+        
+        # Replace $Time$ if present
+        if '$Time$' in template and time is not None:
+            template = template.replace('$Time$', str(time))
+
+        return URLBuilder._finalize_url(base, template)
+
+    @staticmethod
+    def _replace_number(template: str, number: Optional[int]) -> str:
+        """Handle $Number$ placeholder with formatting"""
+        def _replace_number_match(match):
+            num = number if number is not None else 0
+            fmt = match.group(1)
+
+            if fmt:
+                # fmt like %05d -> convert to python format
+                m = re.match(r'%0(\d+)d', fmt)
+                if m:
+                    width = int(m.group(1))
+                    return str(num).zfill(width)
+                
+            return str(num)
+
+        return re.sub(r'\$Number(\%0\d+d)?\$', _replace_number_match, template)
+
+    @staticmethod
+    def _finalize_url(base: str, template: str) -> str:
+        """Finalize URL construction preserving query and fragment"""
+
+        # Split path/query/fragment to avoid urljoin mangling query
+        split = template.split('#', 1)
+        path_and_query = split[0]
+        frag = ('#' + split[1]) if len(split) == 2 else ''
+        
+        if '?' in path_and_query:
+            path_part, query_part = path_and_query.split('?', 1)
+            abs_path = urljoin(base, path_part)
+
+            # ensure we don't accidentally lose existing query separators
+            final = abs_path + '?' + query_part + frag
+
+        else:
+            abs_path = urljoin(base, path_and_query)
+            final = abs_path + frag
+
+        return final
+
+
+class SegmentTimelineParser:
+    """Parser for SegmentTimeline elements"""
+    
+    def __init__(self, namespace: Dict[str, str]):
+        self.ns = namespace
+
+    def parse(self, seg_timeline_element) -> Tuple[List[int], List[int]]:
+        """
+        Parse SegmentTimeline and return (number_list, time_list)
+        """
+        number_list = []
+        time_list = []
+        
+        if seg_timeline_element is None:
+            return number_list, time_list
+
+        current_time = None
+        start_number = 1  # Default start number
+        
+        for s_element in seg_timeline_element.findall('mpd:S', self.ns):
+            d = s_element.get('d')
+            if d is None:
+                continue
+                
+            d = int(d)
+            r = int(s_element.get('r', 0))
+
+            # Handle 't' attribute
+            if s_element.get('t') is not None:
+                current_time = int(s_element.get('t'))
+            elif current_time is None:
+                current_time = 0
+
+            # Append (r+1) times and numbers
+            for i in range(r + 1):
+                number_list.append(start_number)
+                time_list.append(current_time)
+                start_number += 1
+                current_time += d
+                
+        return number_list, time_list
+
+
+class RepresentationParser:
+    """Parser for individual representations"""
+    
+    def __init__(self, mpd_url: str, namespace: Dict[str, str]):
+        self.mpd_url = mpd_url
+        self.ns = namespace
+        self.timeline_parser = SegmentTimelineParser(namespace)
+
+    def parse_adaptation_set(self, adapt_set, base_url: str) -> List[Dict[str, Any]]:
+        """
+        Parse all representations in an adaptation set
+        """
+        representations = []
+        mime_type = adapt_set.get('mimeType', '')
+        lang = adapt_set.get('lang', '')
+        
+        # Find SegmentTemplate at AdaptationSet level
+        adapt_seg_template = adapt_set.find('mpd:SegmentTemplate', self.ns)
+
+        for rep_element in adapt_set.findall('mpd:Representation', self.ns):
+            representation = self._parse_representation(rep_element, adapt_set, adapt_seg_template, base_url, mime_type, lang)
+            if representation:
+                representations.append(representation)
+                
+        return representations
+
+    def _parse_representation(self, rep_element, adapt_set, adapt_seg_template, base_url: str, mime_type: str, lang: str) -> Optional[Dict[str, Any]]:
+        """Parse a single representation"""
+        rep_id = rep_element.get('id')
+        bandwidth = rep_element.get('bandwidth')
+        codecs = rep_element.get('codecs')
+        width = rep_element.get('width')
+        height = rep_element.get('height')
+        audio_sampling_rate = rep_element.get('audioSamplingRate')
+
+        # Try to find SegmentTemplate at Representation level
+        rep_seg_template = rep_element.find('mpd:SegmentTemplate', self.ns)
+        seg_tmpl = rep_seg_template if rep_seg_template is not None else adapt_seg_template
+        
+        if seg_tmpl is None:
+            return None
+
+        # Build URLs
+        rep_base_url = self._resolve_base_url(rep_element, adapt_set, base_url)
+        init_url, media_urls = self._build_segment_urls(seg_tmpl, rep_id, bandwidth, rep_base_url)
+
+        # Determine content type first
+        content_type = 'unknown'
+        if mime_type:
+            content_type = mime_type.split('/')[0]
+        elif width or height:
+            content_type = 'video'
+        elif audio_sampling_rate or (codecs and 'mp4a' in codecs.lower()):
+            content_type = 'audio'
+
+        # Clean language: convert None, empty string, or "undefined" to None
+        # For audio tracks without language, generate a generic name
+        clean_lang = None
+        if lang and lang.lower() not in ['undefined', 'none', '']:
+            clean_lang = lang
+        elif content_type == 'audio':
+
+            # Generate generic audio track name based on rep_id or bandwidth
+            if rep_id:
+                clean_lang = f"aud_{rep_id}"
+            else:
+                clean_lang = f"aud_{bandwidth or '0'}"
+
+        return {
+            'id': rep_id,
+            'type': content_type,
+            'codec': codecs,
+            'bandwidth': int(bandwidth) if bandwidth else 0,
+            'width': int(width) if width else 0,
+            'height': int(height) if height else 0,
+            'audio_sampling_rate': int(audio_sampling_rate) if audio_sampling_rate else 0,
+            'language': clean_lang,
+            'init_url': init_url,
+            'segment_urls': media_urls
+        }
+
+    def _resolve_base_url(self, rep_element, adapt_set, initial_base: str) -> str:
+        """Resolve base URL by concatenating MPD -> Period/AdaptationSet -> Representation BaseURLs"""
+        base = initial_base
+
+        # Adaptation-level BaseURL
+        if adapt_set is not None:
+            adapt_base = adapt_set.find('mpd:BaseURL', self.ns)
+            if adapt_base is not None and adapt_base.text:
+                base_text = adapt_base.text.strip()
+
+                # Handle BaseURL that might already be absolute
+                if base_text.startswith('http'):
+                    base = base_text
+                else:
+                    base = urljoin(base, base_text)
+
+        # Representation-level BaseURL
+        if rep_element is not None:
+            rep_base = rep_element.find('mpd:BaseURL', self.ns)
+            if rep_base is not None and rep_base.text:
+                base_text = rep_base.text.strip()
+
+                # Handle BaseURL that might already be absolute
+                if base_text.startswith('http'):
+                    base = base_text
+                else:
+                    base = urljoin(base, base_text)
+
+        return base
+
+    def _build_segment_urls(self, seg_tmpl, rep_id: str, bandwidth: str, base_url: str) -> Tuple[str, List[str]]:
+        """Build initialization and media segment URLs"""
+        init = seg_tmpl.get('initialization')
+        media = seg_tmpl.get('media')
+        start_number = int(seg_tmpl.get('startNumber', 1))
+
+        # Build init URL
+        init_url = URLBuilder.build_url(
+            base_url, init, 
+            rep_id=rep_id, 
+            bandwidth=int(bandwidth) if bandwidth else None
+        ) if init else None
+
+        # Parse segment timeline
+        seg_timeline = seg_tmpl.find('mpd:SegmentTimeline', self.ns)
+        number_list, time_list = self.timeline_parser.parse(seg_timeline)
+        
+        if not number_list:
+            number_list = list(range(start_number, start_number + 100))
+
+        # Build media URLs
+        media_urls = self._build_media_urls(media, base_url, rep_id, bandwidth, number_list, time_list)
+
+        return init_url, media_urls
+
+    def _build_media_urls(self, media_template: str, base_url: str, rep_id: str, bandwidth: str, number_list: List[int], time_list: List[int]) -> List[str]:
+        """Build list of media segment URLs"""
+        if not media_template:
+            return []
+
+        media_urls = []
+        bandwidth_int = int(bandwidth) if bandwidth else None
+
+        if '$Time$' in media_template and time_list:
+            for t in time_list:
+                media_urls.append(URLBuilder.build_url(
+                    base_url, media_template, 
+                    rep_id=rep_id, time=t, bandwidth=bandwidth_int
+                ))
+        elif '$Number' in media_template and number_list:
+            for n in number_list:
+                media_urls.append(URLBuilder.build_url(
+                    base_url, media_template, 
+                    rep_id=rep_id, number=n, bandwidth=bandwidth_int
+                ))
+        else:
+            media_urls.append(URLBuilder.build_url(
+                base_url, media_template, 
+                rep_id=rep_id, bandwidth=bandwidth_int
+            ))
+
+        return media_urls
 
 
 class MPDParser:
+    @staticmethod
+    def _deduplicate_videos(representations: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+        """
+        Remove duplicate video representations with same resolution.
+        Keep the one with best codec, then highest bandwidth.
+        """
+        resolution_map = {}
+        
+        for rep in representations:
+            key = (rep['width'], rep['height'])
+            
+            if key not in resolution_map:
+                resolution_map[key] = rep
+            else:
+                existing = resolution_map[key]
+                
+                # Compare codec quality first
+                existing_codec_rank = CodecQuality.get_video_codec_rank(existing['codec'])
+                new_codec_rank = CodecQuality.get_video_codec_rank(rep['codec'])
+                
+                if new_codec_rank > existing_codec_rank:
+                    resolution_map[key] = rep
+                elif new_codec_rank == existing_codec_rank and rep['bandwidth'] > existing['bandwidth']:
+                    resolution_map[key] = rep
+        
+        return list(resolution_map.values())
+    
+    @staticmethod
+    def _deduplicate_audios(representations: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+        """
+        Remove duplicate audio representations.
+        Group by (language, sampling_rate) and keep the one with best codec, then highest bandwidth.
+        """
+        audio_map = {}
+        
+        for rep in representations:
+
+            # Use both language and sampling rate as key to differentiate audio tracks
+            key = (rep['language'], rep['audio_sampling_rate'])
+            
+            if key not in audio_map:
+                audio_map[key] = rep
+            else:
+                existing = audio_map[key]
+                
+                # Compare codec quality first
+                existing_codec_rank = CodecQuality.get_audio_codec_rank(existing['codec'])
+                new_codec_rank = CodecQuality.get_audio_codec_rank(rep['codec'])
+                
+                if new_codec_rank > existing_codec_rank:
+                    audio_map[key] = rep
+                elif new_codec_rank == existing_codec_rank and rep['bandwidth'] > existing['bandwidth']:
+                    audio_map[key] = rep
+        
+        return list(audio_map.values())
+
     @staticmethod
     def get_best(representations):
         """
@@ -54,28 +431,51 @@ class MPDParser:
             return [r for r in representations if r['type'] == type_filter]
         return representations
 
-    def __init__(self, mpd_url):
+    def __init__(self, mpd_url: str):
         self.mpd_url = mpd_url
         self.pssh = None
         self.representations = []
-        self.base_url = mpd_url.rsplit('/', 1)[0] + '/'
+        self.ns = {}
+        self.root = None
+
+    def parse(self, custom_headers: Dict[str, str]) -> None:
+        """Parse the MPD file and extract all representations"""
+        self._fetch_and_parse_mpd(custom_headers)
+        self._extract_namespace()
+        self._extract_pssh()
+        self._parse_representations()
+        self._deduplicate_representations()
+
+    def _fetch_and_parse_mpd(self, custom_headers: Dict[str, str]) -> None:
+        """Fetch MPD content and parse XML"""
+        for attempt in range(max_retry + 1):
+            try:
+                response = requests.get(
+                    self.mpd_url, headers=custom_headers, timeout=max_timeout, 
+                    allow_redirects=True, impersonate="chrome124"
+                )
+                
+                response.raise_for_status()
+                self.root = ET.fromstring(response.content)
+                break
 
-    def parse(self, custom_headers):
-        response = httpx.get(self.mpd_url, headers=custom_headers, timeout=max_timeout, follow_redirects=True)
-        response.raise_for_status()
+            except Exception as e:
+                if attempt == max_retry:
+                    raise e
 
-        root = ET.fromstring(response.content)
+                console.print(f"[bold yellow]Retrying manifest request ... ({attempt + 1}/{max_retry})[/bold yellow]")
 
-        # Properly handle default namespace
-        ns = {}
-        if root.tag.startswith('{'):
-            uri = root.tag[1:].split('}')[0]
-            ns['mpd'] = uri
-            ns['cenc'] = 'urn:mpeg:cenc:2013'
+    def _extract_namespace(self) -> None:
+        """Extract and register namespaces from the root element"""
+        if self.root.tag.startswith('{'):
+            uri = self.root.tag[1:].split('}')[0]
+            self.ns['mpd'] = uri
+            self.ns['cenc'] = 'urn:mpeg:cenc:2013'
 
-        # Extract PSSH dynamically: take the first <cenc:pssh> found
-        for protection in root.findall('.//mpd:ContentProtection', ns):
-            pssh_element = protection.find('cenc:pssh', ns)
+    def _extract_pssh(self) -> None:
+        """Extract PSSH from ContentProtection elements"""
+        for protection in self.root.findall('.//mpd:ContentProtection', self.ns):
+            pssh_element = protection.find('cenc:pssh', self.ns)
             if pssh_element is not None and pssh_element.text:
                 self.pssh = pssh_element.text
                 break
@@ -83,83 +483,42 @@ class MPDParser:
         if not self.pssh:
             console.print("[bold red]PSSH not found in MPD![/bold red]")
 
-        # Extract representations
-        for adapt_set in root.findall('.//mpd:AdaptationSet', ns):
-            mime_type = adapt_set.get('mimeType', '')
-            lang = adapt_set.get('lang', '')
-
-            # Find SegmentTemplate at AdaptationSet level (DASH spec allows this)
-            seg_template = adapt_set.find('mpd:SegmentTemplate', ns)
-
-            for rep in adapt_set.findall('mpd:Representation', ns):
-                rep_id = rep.get('id')
-                bandwidth = rep.get('bandwidth')
-                codecs = rep.get('codecs')
-                width = rep.get('width')
-                height = rep.get('height')
-
-                # Try to find SegmentTemplate at Representation level (overrides AdaptationSet)
-                rep_seg_template = rep.find('mpd:SegmentTemplate', ns)
-                seg_tmpl = rep_seg_template if rep_seg_template is not None else seg_template
-                if seg_tmpl is None:
-                    continue
-
-                init = seg_tmpl.get('initialization')
-                media = seg_tmpl.get('media')
-                start_number = int(seg_tmpl.get('startNumber', 1))
-
-                # Use BaseURL from Representation if present, else fallback to self.base_url
-                base_url_elem = rep.find('mpd:BaseURL', ns)
-                base_url = base_url_elem.text if base_url_elem is not None else self.base_url
-
-                # Replace $RepresentationID$ in init/media if present
-                if init and '$RepresentationID$' in init:
-                    init = init.replace('$RepresentationID$', rep_id)
-                if media and '$RepresentationID$' in media:
-                    media = media.replace('$RepresentationID$', rep_id)
-
-                init_url = urljoin(base_url, init) if init else None
-
-                # Calculate segments from timeline
-                segments = []
-                seg_timeline = seg_tmpl.find('mpd:SegmentTimeline', ns)
-                if seg_timeline is not None:
-                    segment_number = start_number
-                    for s in seg_timeline.findall('mpd:S', ns):
-                        repeat = int(s.get('r', 0))
-                        
-                        # Always append at least one segment
-                        segments.append(segment_number)
-                        segment_number += 1
-                        for _ in range(repeat):
-                            segments.append(segment_number)
-                            segment_number += 1
-
-                if not segments:
-                    segments = list(range(start_number, start_number + 100))
-
-                # Replace $Number$ and $RepresentationID$ in media URL
-                media_urls = []
-                for n in segments:
-                    url = media
-                    if '$Number$' in url:
-                        url = url.replace('$Number$', str(n))
-                    if '$RepresentationID$' in url:
-                        url = url.replace('$RepresentationID$', rep_id)
-                    media_urls.append(urljoin(base_url, url))
-
-                self.representations.append({
-                    'id': rep_id,
-                    'type': mime_type.split('/')[0] if mime_type else (rep.get('mimeType', '').split('/')[0] if rep.get('mimeType') else 'unknown'),
-                    'codec': codecs,
-                    'bandwidth': int(bandwidth) if bandwidth else 0,
-                    'width': int(width) if width else 0,
-                    'height': int(height) if height else 0,
-                    'language': lang,
-                    'init_url': init_url,
-                    'segment_urls': media_urls
-                })
+    def _parse_representations(self) -> None:
+        """Parse all representations from the MPD"""
+        base_url = self._get_initial_base_url()
+        representation_parser = RepresentationParser(self.mpd_url, self.ns)
+
+        for adapt_set in self.root.findall('.//mpd:AdaptationSet', self.ns):
+            representations = representation_parser.parse_adaptation_set(adapt_set, base_url)
+            self.representations.extend(representations)
 
+    def _deduplicate_representations(self) -> None:
+        """Remove duplicate video and audio representations"""
+        videos = [r for r in self.representations if r['type'] == 'video']
+        audios = [r for r in self.representations if r['type'] == 'audio']
+        others = [r for r in self.representations if r['type'] not in ['video', 'audio']]
+        
+        deduplicated_videos = self._deduplicate_videos(videos)
+        deduplicated_audios = self._deduplicate_audios(audios)
+        self.representations = deduplicated_videos + deduplicated_audios + others
+
+    def _get_initial_base_url(self) -> str:
+        """Get the initial base URL from MPD-level BaseURL"""
+        base_url = self.mpd_url.rsplit('/', 1)[0] + '/'
+        
+        # MPD-level BaseURL
+        mpd_base = self.root.find('mpd:BaseURL', self.ns)
+        if mpd_base is not None and mpd_base.text:
+            base_text = mpd_base.text.strip()
+
+            # Handle BaseURL that might already be absolute
+            if base_text.startswith('http'):
+                base_url = base_text
+            else:
+                base_url = urljoin(base_url, base_text)
+            
+        return base_url
+    
     def get_resolutions(self):
         """Return list of video representations with their resolutions."""
         return [
@@ -222,19 +581,18 @@ class MPDParser:
         Returns: (selected_audio, list_available_audio_langs, filter_custom_audio, downloadable_audio)
         """
         audio_reps = self.get_audios()
-        list_available_audio_langs = [
-            rep['language'] or "None" for rep in audio_reps
-        ]
+        
+        # Include all languages (including generated ones like aud_XXX)
+        list_available_audio_langs = [rep['language'] for rep in audio_reps]
 
         selected_audio = None
         filter_custom_audio = "First"
 
         if preferred_audio_langs:
-            
             # Search for the first available language in order of preference
             for lang in preferred_audio_langs:
                 for rep in audio_reps:
-                    if (rep['language'] or "None").lower() == lang.lower():
+                    if rep['language'] and rep['language'].lower() == lang.lower():
                         selected_audio = rep
                         filter_custom_audio = lang
                         break
@@ -245,5 +603,5 @@ class MPDParser:
         else:
             selected_audio = self.get_best_audio()
 
-        downloadable_audio = selected_audio['language'] or "None" if selected_audio else "N/A"
+        downloadable_audio = selected_audio['language'] if selected_audio else "N/A"
         return selected_audio, list_available_audio_langs, filter_custom_audio, downloadable_audio