From 8dced09ed0fd0961e8842066516e047f68835b66 Mon Sep 17 00:00:00 2001 From: npayne Date: Sat, 28 Jan 2023 11:33:00 -0500 Subject: [PATCH] fix some errors in bandlab extractor - test now passes --- youtube_dl/extractor/bandlab.py | 12 ++++++------ youtube_dl/extractor/extractors.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/bandlab.py b/youtube_dl/extractor/bandlab.py index 340734f4c..bb06251ba 100644 --- a/youtube_dl/extractor/bandlab.py +++ b/youtube_dl/extractor/bandlab.py @@ -45,7 +45,7 @@ class BandlabIE(InfoExtractor): class BandlabAlbumOrPlaylistIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?bandlab\.com/[^/]+/(?Palbums|collections)/(?P[^/]+)' - _TRACK_URL_RE = re.compile(r'.+/(?P[^/]+)\.m4a') + _TRACK_ID_RE = re.compile(r'.+/(?P[^/]+)\.m4a') _TESTS = [{ 'url': 'https://www.bandlab.com/sbsdasani/albums/dc26e307-e51f-ed11-95d7-002248452390', 'playlist': [ @@ -142,7 +142,7 @@ class BandlabAlbumOrPlaylistIE(InfoExtractor): kind_regex = re.compile(self._VALID_URL) kind = kind_regex.match(url).group('kind') config = self._download_json( - 'http://www.bandlab.com/api/v1.3/%s/%s' % kind, resource_id) + 'http://www.bandlab.com/api/v1.3/%s/%s' % (kind, resource_id), resource_id) entries = [] for track in try_get(config, lambda x: x['posts'], list) or []: url, name = try_get( @@ -154,16 +154,16 @@ class BandlabAlbumOrPlaylistIE(InfoExtractor): name = strip_or_none(name) if not (url and name): continue - id = self._TRACK_ID_RE.match(url).groupdict().get('id') - if not id: + track_id = self._TRACK_ID_RE.match(url).groupdict().get('id') + if not track_id: continue entries.append({ 'url': url, - 'id': self._TRACK_URL_RE.match(url).group('id'), + 'id': track_id, 'title': name }) - res = { + return { '_type': 'playlist', 'id': resource_id, 'entries': entries, diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 3f9acd0ec..a1327fb8c 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -98,7 +98,7 @@ from .azmedien import AZMedienIE from .baidu import BaiduVideoIE from .bandaichannel import BandaiChannelIE from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE -from .bandlab import BandlabIE, BandlabAlbumIE, BandlabPlaylistIE +from .bandlab import BandlabIE, BandlabAlbumOrPlaylistIE from .bbc import ( BBCCoUkIE, BBCCoUkArticleIE,