projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[theplatform] Fix for python 2.6
[youtube-dl]
/
youtube_dl
/
extractor
/
yandexmusic.py
diff --git
a/youtube_dl/extractor/yandexmusic.py
b/youtube_dl/extractor/yandexmusic.py
index b47aecb15a4def8543934c9fa2df495fbe3e3bc3..f4c0f5702e59bea80046438606dd9a28271d8a30 100644
(file)
--- 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 = 'Яндекс.Музыка - Трек'
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',
_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 = 'Яндекс.Музыка - Альбом'
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',
_TEST = {
'url': 'http://music.yandex.ru/album/540508',
@@
-98,7
+98,7
@@
class YandexMusicAlbumIE(YandexMusicBaseIE):
class YandexMusicPlaylistIE(YandexMusicBaseIE):
IE_NAME = 'yandexmusic:playlist'
IE_DESC = 'Яндекс.Музыка - Плейлист'
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',
_TEST = {
'url': 'http://music.yandex.ru/users/music.partners/playlists/1245',