X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fyandexmusic.py;h=f4c0f5702e59bea80046438606dd9a28271d8a30;hb=c3124c3085e6a9a83ee31ace3a7d528a324c42da;hp=1ee8d1bc0fd49f79a903a9dd9befeba0b8296e67;hpb=dd77f14c641da26429ba32d2464563bf04e1741c;p=youtube-dl

diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dl/extractor/yandexmusic.py
index 1ee8d1bc0..f4c0f5702 100644
--- a/youtube_dl/extractor/yandexmusic.py
+++ b/youtube_dl/extractor/yandexmusic.py
@@ -39,7 +39,7 @@ class YandexMusicBaseIE(InfoExtractor):
 class YandexMusicTrackIE(YandexMusicBaseIE):
     IE_NAME = 'yandexmusic:track'
     IE_DESC = 'Яндекс.Музыка - Трек'
-    _VALID_URL = r'https?://music\.yandex\.ru/album/(?P<album_id>\d+)/track/(?P<id>\d+)'
+    _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/album/(?P<album_id>\d+)/track/(?P<id>\d+)'
 
     _TEST = {
         'url': 'http://music.yandex.ru/album/540508/track/4878838',
@@ -67,7 +67,7 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
 class YandexMusicAlbumIE(YandexMusicBaseIE):
     IE_NAME = 'yandexmusic:album'
     IE_DESC = 'Яндекс.Музыка - Альбом'
-    _VALID_URL = r'https?://music\.yandex\.ru/album/(?P<id>\d+)'
+    _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/album/(?P<id>\d+)/?(\?|$)'
 
     _TEST = {
         'url': 'http://music.yandex.ru/album/540508',
@@ -98,7 +98,7 @@ class YandexMusicAlbumIE(YandexMusicBaseIE):
 class YandexMusicPlaylistIE(YandexMusicBaseIE):
     IE_NAME = 'yandexmusic:playlist'
     IE_DESC = 'Яндекс.Музыка - Плейлист'
-    _VALID_URL = r'https?://music\.yandex\.ru/users/[^/]+/playlists/(?P<id>\d+)'
+    _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/users/[^/]+/playlists/(?P<id>\d+)'
 
     _TEST = {
         'url': 'http://music.yandex.ru/users/music.partners/playlists/1245',