projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c3c9f87
)
[mtvde] Add support for news
author
Sergey M․
<dstftw@gmail.com>
Fri, 28 Aug 2015 15:41:54 +0000
(21:41 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 28 Aug 2015 15:41:54 +0000
(21:41 +0600)
youtube_dl/extractor/mtv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mtv.py
b/youtube_dl/extractor/mtv.py
index 28301d4061d415778f1a07bbe17dac5c5945426a..d160f4a220aa0e264b1d05a4154cd83d049b4416 100644
(file)
--- a/
youtube_dl/extractor/mtv.py
+++ b/
youtube_dl/extractor/mtv.py
@@
-296,7
+296,7
@@
class MTVIggyIE(MTVServicesInfoExtractor):
class MTVDEIE(MTVServicesInfoExtractor):
IE_NAME = 'mtv.de'
class MTVDEIE(MTVServicesInfoExtractor):
IE_NAME = 'mtv.de'
- _VALID_URL = r'https?://(?:www\.)?mtv\.de/(?:artists|shows
)/(?:[^/]+/)+
(?P<id>\d+)-[^/#?]+/*(?:[#?].*)?$'
+ _VALID_URL = r'https?://(?:www\.)?mtv\.de/(?:artists|shows
|news)/(?:[^/]+/)*
(?P<id>\d+)-[^/#?]+/*(?:[#?].*)?$'
_TESTS = [{
'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
'info_dict': {
_TESTS = [{
'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
'info_dict': {
@@
-321,6
+321,19
@@
class MTVDEIE(MTVServicesInfoExtractor):
# rtmp download
'skip_download': True,
},
# rtmp download
'skip_download': True,
},
+ }, {
+ # single video in pagePlaylist with different id
+ 'url': 'http://www.mtv.de/news/77491-mtv-movies-spotlight-pixels-teil-3',
+ 'info_dict': {
+ 'id': 'local_playlist-4e760566473c4c8c5344',
+ 'ext': 'mp4',
+ 'title': 'Article_mtv-movies-spotlight-pixels-teil-3_short-clips_part1',
+ 'description': 'MTV Movies Supercut',
+ },
+ 'params': {
+ # rtmp download
+ 'skip_download': True,
+ },
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-333,6
+346,10
@@
class MTVDEIE(MTVServicesInfoExtractor):
r'window\.pagePlaylist\s*=\s*(\[.+?\]);\n', webpage, 'page playlist'),
video_id)
r'window\.pagePlaylist\s*=\s*(\[.+?\]);\n', webpage, 'page playlist'),
video_id)
+ # news pages contain single video in playlist with different id
+ if len(playlist) == 1:
+ return self._get_videos_info_from_url(playlist[0]['mrss'], video_id)
+
for item in playlist:
item_id = item.get('id')
if item_id and compat_str(item_id) == video_id:
for item in playlist:
item_id = item.get('id')
if item_id and compat_str(item_id) == video_id: