yt_dlp/extractor/soundcloud.py

@@ -210,7 +210,6 @@ class SoundcloudBaseIE(InfoExtractor):
 
         format_urls = set()
         formats = []
-        has_drm = False
         query = {'client_id': self._CLIENT_ID}
         if secret_token:
             query['secret_token'] = secret_token
@@ -246,7 +245,6 @@ class SoundcloudBaseIE(InfoExtractor):
                         'url': format_url,
                         'quality': 10,
                         'format_note': 'Original',
-                        'vcodec': 'none',
                     })
 
         def invalid_url(url):
@@ -262,7 +260,6 @@ class SoundcloudBaseIE(InfoExtractor):
 
             protocol = traverse_obj(t, ('format', 'protocol', {str})) or 'http'
             if protocol.startswith(('ctr-', 'cbc-')):
-                has_drm = True
                 continue
             if protocol == 'progressive':
                 protocol = 'http'
@@ -320,10 +317,7 @@ class SoundcloudBaseIE(InfoExtractor):
                 'preference': -10 if is_preview else None,
             })
 
-        if not formats:
-            if has_drm:
-                self.report_drm(track_id)
-            if info.get('policy') == 'BLOCK':
+        if not formats and info.get('policy') == 'BLOCK':
             self.raise_geo_restricted(metadata_available=True)
 
         user = info.get('user') or {}

yt_dlp/extractor/youtube.py

@@ -518,12 +518,11 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
         return self._search_regex(rf'^({self._YT_CHANNEL_UCID_RE})$', ucid, 'UC-id', default=None)
 
     def handle_or_none(self, handle):
-        return self._search_regex(rf'^({self._YT_HANDLE_RE})$', urllib.parse.unquote(handle or ''),
-                                  '@-handle', default=None)
+        return self._search_regex(rf'^({self._YT_HANDLE_RE})$', handle, '@-handle', default=None)
 
     def handle_from_url(self, url):
         return self._search_regex(rf'^(?:https?://(?:www\.)?youtube\.com)?/({self._YT_HANDLE_RE})',
-                                  urllib.parse.unquote(url or ''), 'channel handle', default=None)
+                                  url, 'channel handle', default=None)
 
     def ucid_from_url(self, url):
         return self._search_regex(rf'^(?:https?://(?:www\.)?youtube\.com)?/({self._YT_CHANNEL_UCID_RE})',
@@ -1496,7 +1495,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         },
         # Age-gate videos. See https://github.com/yt-dlp/yt-dlp/pull/575#issuecomment-888837000
         {
-            'note': 'Embed allowed age-gate video; works with web_embedded',
+            'note': 'Embed allowed age-gate video',
             'url': 'https://youtube.com/watch?v=HtVdAasjOgU',
             'info_dict': {
                 'id': 'HtVdAasjOgU',
@@ -1526,6 +1525,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'heatmap': 'count:100',
                 'timestamp': 1401991663,
             },
+            'skip': 'Age-restricted; requires authentication',
         },
         {
             'note': 'Age-gate video with embed allowed in public site',
@@ -2801,35 +2801,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'extractor_args': {'youtube': {'player_client': ['ios'], 'player_skip': ['webpage']}},
             },
         },
-        {
-            # uploader_id has non-ASCII characters that are percent-encoded in YT's JSON
-            'url': 'https://www.youtube.com/shorts/18NGQq7p3LY',
-            'info_dict': {
-                'id': '18NGQq7p3LY',
-                'ext': 'mp4',
-                'title': '아이브 이서 장원영 리즈 삐끼삐끼 챌린지',
-                'description': '',
-                'uploader': 'ㅇㅇ',
-                'uploader_id': '@으아-v1k',
-                'uploader_url': 'https://www.youtube.com/@으아-v1k',
-                'channel': 'ㅇㅇ',
-                'channel_id': 'UCC25oTm2J7ZVoi5TngOHg9g',
-                'channel_url': 'https://www.youtube.com/channel/UCC25oTm2J7ZVoi5TngOHg9g',
-                'thumbnail': r're:https?://.+/.+\.jpg',
-                'playable_in_embed': True,
-                'age_limit': 0,
-                'duration': 3,
-                'timestamp': 1724306170,
-                'upload_date': '20240822',
-                'availability': 'public',
-                'live_status': 'not_live',
-                'view_count': int,
-                'like_count': int,
-                'channel_follower_count': int,
-                'categories': ['People & Blogs'],
-                'tags': [],
-            },
-        },
     ]
 
     _WEBPAGE_TESTS = [
@@ -4012,20 +3983,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 else:
                     prs.append(pr)
 
-            # web_embedded can work around age-gate and age-verification for some embeddable videos
-            if self._is_agegated(pr) and variant != 'web_embedded':
-                append_client(f'web_embedded.{base_client}')
-            # Unauthenticated users will only get web_embedded client formats if age-gated
-            if self._is_agegated(pr) and not self.is_authenticated:
-                self.to_screen(
-                    f'{video_id}: This video is age-restricted; some formats may be missing '
-                    f'without authentication. {self._login_hint()}', only_once=True)
-
             ''' This code is pointless while web_creator is in _DEFAULT_AUTHED_CLIENTS
             # EU countries require age-verification for accounts to access age-restricted videos
             # If account is not age-verified, _is_agegated() will be truthy for non-embedded clients
-            embedding_is_disabled = variant == 'web_embedded' and self._is_unplayable(pr)
-            if self.is_authenticated and (self._is_agegated(pr) or embedding_is_disabled):
+            if self.is_authenticated and self._is_agegated(pr):
                 self.to_screen(
                     f'{video_id}: This video is age-restricted and YouTube is requiring '
                     'account age-verification; some formats may be missing', only_once=True)

yt_dlp/update.py

@@ -65,14 +65,9 @@ def _get_variant_and_executable_path():
             machine = '_legacy' if version_tuple(platform.mac_ver()[0]) < (10, 15) else ''
         else:
             machine = f'_{platform.machine().lower()}'
-            is_64bits = sys.maxsize > 2**32
             # Ref: https://en.wikipedia.org/wiki/Uname#Examples
             if machine[1:] in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
-                machine = '_x86' if not is_64bits else ''
-            # platform.machine() on 32-bit raspbian OS may return 'aarch64', so check "64-bitness"
-            # See: https://github.com/yt-dlp/yt-dlp/issues/11813
-            elif machine[1:] == 'aarch64' and not is_64bits:
-                machine = '_armv7l'
+                machine = '_x86' if platform.architecture()[0][:2] == '32' else ''
             # sys.executable returns a /tmp/ path for staticx builds (linux_static)
             # Ref: https://staticx.readthedocs.io/en/latest/usage.html#run-time-information
             if static_exe_path := os.getenv('STATICX_PROG_PATH'):
@@ -530,16 +525,11 @@ class Updater:
     @functools.cached_property
     def cmd(self):
         """The command-line to run the executable, if known"""
-        argv = None
         # There is no sys.orig_argv in py < 3.10. Also, it can be [] when frozen
         if getattr(sys, 'orig_argv', None):
-            argv = sys.orig_argv
+            return sys.orig_argv
         elif getattr(sys, 'frozen', False):
-            argv = sys.argv
-        # linux_static exe's argv[0] will be /tmp/staticx-NNNN/yt-dlp_linux if we don't fixup here
-        if argv and os.getenv('STATICX_PROG_PATH'):
-            argv = [self.filename, *argv[1:]]
-        return argv
+            return sys.argv
 
     def restart(self):
         """Restart the executable"""