aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/thesixtyone.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-06-08 02:22:04 +0700
committerSergey M․ <dstftw@gmail.com>2016-06-08 02:22:04 +0700
commit33d9f3707ccccfe8d73c1b398f198792e80a259f (patch)
tree03fb0037158f9178a9db443a9893ed6dbcf7a6ff /youtube_dl/extractor/thesixtyone.py
parenta26a9d62396641364690974de9c859cf26f9acf6 (diff)
downloadyoutube-dl-33d9f3707ccccfe8d73c1b398f198792e80a259f.zip
youtube-dl-33d9f3707ccccfe8d73c1b398f198792e80a259f.tar.gz
youtube-dl-33d9f3707ccccfe8d73c1b398f198792e80a259f.tar.bz2
[thesixtyone] Relax _VALID_URL (Closes #9714)
Diffstat (limited to 'youtube_dl/extractor/thesixtyone.py')
-rw-r--r--youtube_dl/extractor/thesixtyone.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/extractor/thesixtyone.py b/youtube_dl/extractor/thesixtyone.py
index d8b1fd2..d63aef5 100644
--- a/youtube_dl/extractor/thesixtyone.py
+++ b/youtube_dl/extractor/thesixtyone.py
@@ -12,7 +12,7 @@ class TheSixtyOneIE(InfoExtractor):
s|
song/comments/list|
song
- )/(?P<id>[A-Za-z0-9]+)/?$'''
+ )/(?:[^/]+/)?(?P<id>[A-Za-z0-9]+)/?$'''
_SONG_URL_TEMPLATE = 'http://thesixtyone.com/s/{0:}'
_SONG_FILE_URL_TEMPLATE = 'http://{audio_server:}/thesixtyone_production/audio/{0:}_stream'
_THUMBNAIL_URL_TEMPLATE = '{photo_base_url:}_desktop'
@@ -45,6 +45,10 @@ class TheSixtyOneIE(InfoExtractor):
'url': 'http://www.thesixtyone.com/song/SrE3zD7s1jt/',
'only_matching': True,
},
+ {
+ 'url': 'http://www.thesixtyone.com/maryatmidnight/song/StrawberriesandCream/yvWtLp0c4GQ/',
+ 'only_matching': True,
+ },
]
_DECODE_MAP = {