projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a26a9d6
)
[thesixtyone] Relax _VALID_URL (Closes #9714)
author
Sergey M․
<dstftw@gmail.com>
Tue, 7 Jun 2016 19:22:04 +0000
(
02:22
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 7 Jun 2016 19:22:04 +0000
(
02:22
+0700)
youtube_dl/extractor/thesixtyone.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/thesixtyone.py
b/youtube_dl/extractor/thesixtyone.py
index d8b1fd2813eadc3d17a17a6d46766b3c9c4ea37a..d63aef5dea9a8543f2a919b19321582f20e8df86 100644
(file)
--- a/
youtube_dl/extractor/thesixtyone.py
+++ b/
youtube_dl/extractor/thesixtyone.py
@@
-12,7
+12,7
@@
class TheSixtyOneIE(InfoExtractor):
s|
song/comments/list|
song
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'
_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/song/SrE3zD7s1jt/',
'only_matching': True,
},
+ {
+ 'url': 'http://www.thesixtyone.com/maryatmidnight/song/StrawberriesandCream/yvWtLp0c4GQ/',
+ 'only_matching': True,
+ },
]
_DECODE_MAP = {
]
_DECODE_MAP = {