projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[myspace] Add support for song urls (fixes #2040)
[youtube-dl]
/
youtube_dl
/
extractor
/
liveleak.py
diff --git
a/youtube_dl/extractor/liveleak.py
b/youtube_dl/extractor/liveleak.py
index cf8a2c9312a53d8fe3f16b363cce31b2dd7c989d..5ae57a77c65c84d559946a651a3612fab86c8535 100644
(file)
--- a/
youtube_dl/extractor/liveleak.py
+++ b/
youtube_dl/extractor/liveleak.py
@@
-8,7
+8,7
@@
from ..utils import (
class LiveLeakIE(InfoExtractor):
class LiveLeakIE(InfoExtractor):
- _VALID_URL = r'^(?:http
?
://)?(?:\w+\.)?liveleak\.com/view\?(?:.*?)i=(?P<video_id>[\w_]+)(?:.*)'
+ _VALID_URL = r'^(?:http://)?(?:\w+\.)?liveleak\.com/view\?(?:.*?)i=(?P<video_id>[\w_]+)(?:.*)'
IE_NAME = u'liveleak'
_TEST = {
u'url': u'http://www.liveleak.com/view?i=757_1364311680',
IE_NAME = u'liveleak'
_TEST = {
u'url': u'http://www.liveleak.com/view?i=757_1364311680',
@@
-33,11
+33,9
@@
class LiveLeakIE(InfoExtractor):
video_url = self._search_regex(r'file: "(.*?)",',
webpage, u'video URL')
video_url = self._search_regex(r'file: "(.*?)",',
webpage, u'video URL')
- video_title = self._html_search_regex(r'<meta property="og:title" content="(?P<title>.*?)"',
- webpage, u'title').replace('LiveLeak.com -', '').strip()
+ video_title = self._og_search_title(webpage).replace('LiveLeak.com -', '').strip()
- video_description = self._html_search_regex(r'<meta property="og:description" content="(?P<desc>.*?)"',
- webpage, u'description', fatal=False)
+ video_description = self._og_search_description(webpage)
video_uploader = self._html_search_regex(r'By:.*?(\w+)</a>',
webpage, u'uploader', fatal=False)
video_uploader = self._html_search_regex(r'By:.*?(\w+)</a>',
webpage, u'uploader', fatal=False)