Merge 00d8a07eb6 into e1b3fa242c

Fixes #32877

test/test_youtube_signature.py

@@ -166,6 +166,14 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/b22ef6e7/player_ias.vflset/en_US/base.js',
         'b6HcntHGkvBLk_FRf', 'kNPW6A7FyP2l8A',
     ),
+    (
+        'https://www.youtube.com/s/player/3400486c/player_ias.vflset/en_US/base.js',
+        'lL46g3XifCKUZn1Xfw', 'z767lhet6V2Skl',
+    ),
+    (
+        'https://www.youtube.com/s/player/5604538d/player_ias.vflset/en_US/base.js',
+        '7X-he4jjvMx7BCX', 'sViSydX8IHtdWA',
+    ),
 ]
 
 

youtube_dl/extractor/bandlab.py

@@ -0,0 +1,170 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+from ..utils import (
+    ExtractorError,
+    merge_dicts,
+    T,
+    traverse_obj,
+    txt_or_none,
+    url_or_none,
+)
+
+
+class BandlabIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?bandlab\.com/post/(?P<id>[^/]+)'
+
+    _TESTS = [{
+        'url': 'https://www.bandlab.com/post/f5f04998635a44ea819cacdba7ae2076_f8d8574c3bdaec11b6562818783151a1',
+        'info_dict': {
+            'id': 'f5f04998635a44ea819cacdba7ae2076_f8d8574c3bdaec11b6562818783151a1',
+            'ext': 'm4a',
+            'title': 'ON MY OWN (unreleased)',
+            'artist': 'Michael MacDonald',
+        },
+    }]
+
+    def _real_extract(self, url):
+        track_id = self._match_id(url)
+        config = self._download_json(
+            'http://www.bandlab.com/api/v1.3/posts/%s' % track_id, track_id)
+        track_url = traverse_obj(config, ('track', 'sample', 'audioUrl', T(url_or_none)))
+        if not track_url:
+            raise ExtractorError(
+                '[%s] No video formats found!' % (self.ie_key(), ),
+                video_id=track_id, expected=True)
+        title = config['track']['name']
+
+        return {
+            'id': track_id,
+            'title': title,
+            'url': track_url,
+            'artist': traverse_obj(config, ('creator', 'name', T(txt_or_none))),
+        }
+
+
+class BandlabAlbumOrPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?bandlab\.com/[^/]+/(?P<kind>albums|collections)/(?P<id>[^/]+)'
+    _TESTS = [{
+        'url': 'https://www.bandlab.com/sbsdasani/albums/dc26e307-e51f-ed11-95d7-002248452390',
+        'playlist': [
+            {
+                'info_dict': {
+                    'id': '91feeb36-8e10-4c91-ae57-ffac0a98c6b4',
+                    'title': 'How\'d I Lose You? (Intro)',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': 'd87c50a2-70cb-4937-9b97-3ae8646ca3aa',
+                    'title': 'Money $$$',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': 'ff2909ff-348f-448d-9d2c-7edbf2f0ec5e',
+                    'title': 'You\'ll Be Mine',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': '53786c38-1f3c-4921-9271-793a64af7186',
+                    'title': 'Who You Are',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': '0394bb27-113f-4d19-b902-f9c1fe6ba8a8',
+                    'title': 'In Your Eyes',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': '2aa44689-c7fa-4d0e-b28a-e0d1dd570372',
+                    'title': 'The Same',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': '281fe589-a559-4260-802d-78a6c7a973d8',
+                    'title': 'Fall In Love',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': '83a9dc0a-702f-40fd-82f6-ab847f6a7b46',
+                    'title': 'Tried So Hard',
+                    'ext': 'm4a',
+                },
+            },
+            {
+                'info_dict': {
+                    'id': '3f6a4a1c-eb73-449f-bd45-f7958d6f2de1',
+                    'title': 'The End Of Everything',
+                    'ext': 'm4a',
+                },
+            }
+        ],
+        'info_dict': {
+            'id': 'dc26e307-e51f-ed11-95d7-002248452390',
+            'album': 'ENDLESS SUMMER',
+            'artist': 'Michael MacDonald'
+        },
+    }, {
+        'url': 'https://www.bandlab.com/hexatetrahedronx/collections/8fb1041c-e865-eb11-9889-0050f28a2802',
+        'playlist': [
+            {
+                'info_dict': {
+                    'id': '8f37e4aa-92c4-eb11-a7ad-0050f280467f',
+                    'title': 'psych ward',
+                    'ext': 'm4a'
+                }
+            }
+        ],
+        'info_dict': {
+            'id': '8fb1041c-e865-eb11-9889-0050f28a2802',
+            'album': 'DOOMTAPE',
+            'artist': '12days'
+        }
+    }]
+
+    def _real_extract(self, url):
+        resource_id, kind = self._match_valid_url(url).group('id', 'kind')
+        config = self._download_json(
+            'http://www.bandlab.com/api/v1.3/%s/%s' % (kind, resource_id), resource_id)
+        entries = []
+        for track in traverse_obj(config, ('posts', Ellipsis)):
+            url, name = (traverse_obj(track, ('track', {
+                'url': ('sample', 'audioUrl', T(url_or_none)),
+                'name': ('name', T(txt_or_none)),
+            }), ('revision', {
+                'url': ('mixdown', 'file', T(url_or_none)),
+                'name': ('song', 'name', T(txt_or_none)),
+            })).get(x) for x in ('url', 'name'))
+            if not (url and name):
+                continue
+            track_id = self._search_regex(
+                r'/([^/]+)\.m4a$', url, 'track id', default=None)
+            if not track_id:
+                continue
+            entries.append({
+                'url': url,
+                'id': track_id,
+                'title': name,
+            })
+
+        return merge_dicts(
+            self.playlist_result(entries, playlist_id=resource_id),
+            traverse_obj(config, {
+                'album': ('name', T(txt_or_none)),
+                'artist': ('creator', 'name', T(txt_or_none)),
+            }))

youtube_dl/extractor/extractors.py

@@ -98,6 +98,10 @@ from .azmedien import AZMedienIE
 from .baidu import BaiduVideoIE
 from .bandaichannel import BandaiChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
+from .bandlab import (
+    BandlabIE, 
+    BandlabAlbumOrPlaylistIE
+)
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,

youtube_dl/extractor/youtube.py

@@ -1647,7 +1647,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         except JSInterpreter.Exception as e:
             self.report_warning(
                 '%s (%s %s)' % (
-                    'Unable to decode n-parameter: download likely to be throttled',
+                    'Unable to decode n-parameter: expect download to be blocked or throttled',
                     error_to_compat_str(e),
                     traceback.format_exc()),
                 video_id=video_id)
@@ -1659,18 +1659,22 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
     def _extract_n_function_name(self, jscode):
         func_name, idx = self._search_regex(
             # new: (b=String.fromCharCode(110),c=a.get(b))&&c=nfunc[idx](c)
+            # or:  (b="nn"[+a.D],c=a.get(b))&&(c=nfunc[idx](c)s
             # old: .get("n"))&&(b=nfunc[idx](b)
             # older: .get("n"))&&(b=nfunc(b)
             r'''(?x)
-                (?:\(\s*(?P<b>[a-z])\s*=\s*String\s*\.\s*fromCharCode\s*\(\s*110\s*\)\s*,(?P<c>[a-z])\s*=\s*[a-z]\s*)?
+                (?:\(\s*(?P<b>[a-z])\s*=\s*(?:
-                \.\s*get\s*\(\s*(?(b)(?P=b)|"n")(?:\s*\)){2}\s*&&\s*\(\s*(?(c)(?P=c)|b)\s*=\s*
+                    String\s*\.\s*fromCharCode\s*\(\s*110\s*\)|
+                    "n+"\[\s*\+?s*[\w$.]+\s*]
+                )\s*,(?P<c>[a-z])\s*=\s*[a-z]\s*)?
+                \.\s*get\s*\(\s*(?(b)(?P=b)|"n{1,2}")(?:\s*\)){2}\s*&&\s*\(\s*(?(c)(?P=c)|b)\s*=\s*
                 (?P<nfunc>[a-zA-Z_$][\w$]*)(?:\s*\[(?P<idx>\d+)\])?\s*\(\s*[\w$]+\s*\)
             ''', jscode, 'Initial JS player n function name', group=('nfunc', 'idx'))
         if not idx:
             return func_name
 
         return self._parse_json(self._search_regex(
-            r'var {0}\s*=\s*(\[.+?\])\s*[,;]'.format(re.escape(func_name)), jscode,
+            r'var\s+{0}\s*=\s*(\[.+?\])\s*[,;]'.format(re.escape(func_name)), jscode,
             'Initial JS player n function list ({0}.{1})'.format(func_name, idx)),
             func_name, transform_source=js_to_json)[int(idx)]