projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vevo] Revert videoplayer.vevo.com to api.vevo.com
[youtube-dl]
/
youtube_dl
/
extractor
/
liveleak.py
diff --git
a/youtube_dl/extractor/liveleak.py
b/youtube_dl/extractor/liveleak.py
index c658cc92bdd505badc8ba579afd2743fad941746..29fba5f30b0cc4633dbc978e886c62eab0d4ac81 100644
(file)
--- a/
youtube_dl/extractor/liveleak.py
+++ b/
youtube_dl/extractor/liveleak.py
@@
-41,17
+41,26
@@
class LiveLeakIE(InfoExtractor):
'age_limit': 18,
}
}, {
'age_limit': 18,
}
}, {
+ # Covers https://github.com/rg3/youtube-dl/pull/5983
'url': 'http://www.liveleak.com/view?i=801_1409392012',
'md5': '0b3bec2d888c20728ca2ad3642f0ef15',
'info_dict': {
'id': '801_1409392012',
'ext': 'mp4',
'url': 'http://www.liveleak.com/view?i=801_1409392012',
'md5': '0b3bec2d888c20728ca2ad3642f0ef15',
'info_dict': {
'id': '801_1409392012',
'ext': 'mp4',
- 'description':
"Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach."
,
+ 'description':
'Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.'
,
'uploader': 'bony333',
'title': 'Crazy Hungarian tourist films close call waterspout in Croatia'
}
}]
'uploader': 'bony333',
'title': 'Crazy Hungarian tourist films close call waterspout in Croatia'
}
}]
+ @staticmethod
+ def _extract_url(webpage):
+ mobj = re.search(
+ r'<iframe[^>]+src="https?://(?:\w+\.)?liveleak\.com/ll_embed\?(?:.*?)i=(?P<id>[\w_]+)(?:.*)',
+ webpage)
+ if mobj:
+ return 'http://www.liveleak.com/view?i=%s' % mobj.group('id')
+
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
@@
-95,7
+104,10
@@
class LiveLeakIE(InfoExtractor):
'url': s['file'],
} for i, s in enumerate(sources)]
for i, s in enumerate(sources):
'url': s['file'],
} for i, s in enumerate(sources)]
for i, s in enumerate(sources):
- orig_url = re.sub(r'.h264_.+\.mp4', '', s['file'])
+ # Removing '.h264_*.mp4' gives the raw video, which is essentially
+ # the same video without the LiveLeak logo at the top (see
+ # https://github.com/rg3/youtube-dl/pull/4768)
+ orig_url = re.sub(r'\.h264_.+?\.mp4', '', s['file'])
if s['file'] != orig_url:
formats.append({
'format_id': 'original-%s' % i,
if s['file'] != orig_url:
formats.append({
'format_id': 'original-%s' % i,