From: Sergey M․ Date: Mon, 14 Dec 2020 05:52:25 +0000 (+0700) Subject: [yandexmusic:album] Simplify X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=c98052c5da1c984a2d1f0f426261e1147df5ae6e;p=youtube-dl [yandexmusic:album] Simplify --- diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dl/extractor/yandexmusic.py index b64632836..7893f363e 100644 --- a/youtube_dl/extractor/yandexmusic.py +++ b/youtube_dl/extractor/yandexmusic.py @@ -247,7 +247,7 @@ class YandexMusicPlaylistBaseIE(YandexMusicBaseIE): class YandexMusicAlbumIE(YandexMusicPlaylistBaseIE): IE_NAME = 'yandexmusic:album' IE_DESC = 'Яндекс.Музыка - Альбом' - _VALID_URL = r'%s/album/(?P\d+)/?(\?|$)' % YandexMusicBaseIE._VALID_URL_BASE + _VALID_URL = r'%s/album/(?P\d+)' % YandexMusicBaseIE._VALID_URL_BASE _TESTS = [{ 'url': 'http://music.yandex.ru/album/540508', @@ -275,6 +275,10 @@ class YandexMusicAlbumIE(YandexMusicPlaylistBaseIE): 'playlist_count': 187, }] + @classmethod + def suitable(cls, url): + return False if YandexMusicTrackIE.suitable(url) else super(YandexMusicAlbumIE, cls).suitable(url) + def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) tld = mobj.group('tld')