projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c4aa6f
)
[youtube:playlist] Recognize another playlist pattern (closes #11928, closes #12286)
author
Sergey M․
<dstftw@gmail.com>
Tue, 28 Feb 2017 16:06:47 +0000
(23:06 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 28 Feb 2017 16:06:47 +0000
(23:06 +0700)
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index 7053e5512b0c76bd3c650e9ae9b00fd87505af4c..81c7939215bcfccb60b11b2ff28336f0f8d163c5 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-1851,7
+1851,7
@@
class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
(?:
youtube\.com/
(?:
(?:
youtube\.com/
(?:
- (?:course|view_play_list|my_playlists|artist|playlist|watch|embed/
videoseries
)
+ (?:course|view_play_list|my_playlists|artist|playlist|watch|embed/
(?:videoseries|[0-9A-Za-z_-]{11})
)
\? (?:.*?[&;])*? (?:p|a|list)=
| p/
)|
\? (?:.*?[&;])*? (?:p|a|list)=
| p/
)|
@@
-1924,6
+1924,13
@@
class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
'title': 'JODA15',
'id': 'PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
}
'title': 'JODA15',
'id': 'PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
}
+ }, {
+ 'url': 'http://www.youtube.com/embed/_xDOZElKyNU?list=PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
+ 'playlist_mincount': 485,
+ 'info_dict': {
+ 'title': '2017 華語最新單曲 (2/24更新)',
+ 'id': 'PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
+ }
}, {
'note': 'Embedded SWF player',
'url': 'https://www.youtube.com/p/YN5VISEtHet5D4NEvfTd0zcgFk84NqFZ?hl=en_US&fs=1&rel=0',
}, {
'note': 'Embedded SWF player',
'url': 'https://www.youtube.com/p/YN5VISEtHet5D4NEvfTd0zcgFk84NqFZ?hl=en_US&fs=1&rel=0',
@@
-2072,7
+2079,7
@@
class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
# Check if it's a video-specific URL
query_dict = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
video_id = query_dict.get('v', [None])[0] or self._search_regex(
# Check if it's a video-specific URL
query_dict = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
video_id = query_dict.get('v', [None])[0] or self._search_regex(
- r'(?:
^|//)youtu\.be/
([0-9A-Za-z_-]{11})', url,
+ r'(?:
(?:^|//)youtu\.be/|youtube\.com/embed/(?!videoseries))
([0-9A-Za-z_-]{11})', url,
'video id', default=None)
if video_id:
if self._downloader.params.get('noplaylist'):
'video id', default=None)
if video_id:
if self._downloader.params.get('noplaylist'):