youtube_dl/extractor/bandlab.py

@@ -1,14 +1,17 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import re
+
 from .common import InfoExtractor
 
+from ..compat import (
+    compat_str,
+)
+
 from ..utils import (
-    ExtractorError,
+    strip_or_none,
-    merge_dicts,
+    try_get,
-    T,
-    traverse_obj,
-    txt_or_none,
     url_or_none,
 )
 
@@ -30,23 +33,19 @@ class BandlabIE(InfoExtractor):
         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)))
+        track_url = config['track']['sample']['audioUrl']
-        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,
+            'title': config['track']['name'],
             'url': track_url,
-            'artist': traverse_obj(config, ('creator', 'name', T(txt_or_none))),
+            'artist': config['creator']['name']
         }
 
 
 class BandlabAlbumOrPlaylistIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?bandlab\.com/[^/]+/(?P<kind>albums|collections)/(?P<id>[^/]+)'
+    _TRACK_ID_RE = r'.+/(?P<id>[^/]+)\.m4a'
     _TESTS = [{
         'url': 'https://www.bandlab.com/sbsdasani/albums/dc26e307-e51f-ed11-95d7-002248452390',
         'playlist': [
@@ -138,22 +137,21 @@ class BandlabAlbumOrPlaylistIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        resource_id, kind = self._match_valid_url(url).group('id', 'kind')
+        resource_id, kind = re.match(self._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)):
+        for track in try_get(config, lambda x: x['posts'], list) or []:
-            url, name = (traverse_obj(track, ('track', {
+            url, name = try_get(
-                'url': ('sample', 'audioUrl', T(url_or_none)),
+                track,
-                'name': ('name', T(txt_or_none)),
+                (lambda x: (x['track']['sample']['audioUrl'], x['track']['name']),
-            }), ('revision', {
+                 lambda x: (x['revision']['mixdown']['file'], x['revision']['song']['name'])),
-                'url': ('mixdown', 'file', T(url_or_none)),
+                tuple) or (None, '', )
-                'name': ('song', 'name', T(txt_or_none)),
+            url = url_or_none(url)
-            })).get(x) for x in ('url', 'name'))
+            name = strip_or_none(name)
             if not (url and name):
                 continue
-            track_id = self._search_regex(
+            track_id = re.match(self._TRACK_ID_RE, url).group('id')
-                r'/([^/]+)\.m4a$', url, 'track id', default=None)
             if not track_id:
                 continue
             entries.append({
@@ -162,9 +160,10 @@ class BandlabAlbumOrPlaylistIE(InfoExtractor):
                 'title': name,
             })
 
-        return merge_dicts(
+        return {
-            self.playlist_result(entries, playlist_id=resource_id),
+            '_type': 'playlist',
-            traverse_obj(config, {
+            'id': resource_id,
-                'album': ('name', T(txt_or_none)),
+            'entries': entries,
-                'artist': ('creator', 'name', T(txt_or_none)),
+            'album': try_get(config, lambda x: x['name'].strip(), compat_str),
-            }))
+            'artist': try_get(config, lambda x: x['creator']['name'].strip(), compat_str)
+        }