projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
251974e
)
[liveleak] Support multiple formats (Fixes #2262)
author
Philipp Hagemeister
<phihag@phihag.de>
Thu, 30 Jan 2014 03:52:50 +0000
(
04:52
+0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Thu, 30 Jan 2014 03:52:50 +0000
(
04:52
+0100)
youtube_dl/extractor/liveleak.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/liveleak.py
b/youtube_dl/extractor/liveleak.py
index d01fd01e3a5413b8b98305c94507ce25d8dab44e..a571fa742e32433c3a5ba0591958d4d87237d0c7 100644
(file)
--- a/
youtube_dl/extractor/liveleak.py
+++ b/
youtube_dl/extractor/liveleak.py
@@
-1,5
+1,6
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+import json
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
@@
-26,8
+27,16
@@
class LiveLeakIE(InfoExtractor):
video_id = mobj.group('video_id')
webpage = self._download_webpage(url, video_id)
video_id = mobj.group('video_id')
webpage = self._download_webpage(url, video_id)
- video_url = self._search_regex(
- r'file: "(.*?)",', webpage, 'video URL')
+ sources_raw = self._search_regex(
+ r'(?s)sources:\s*(\[.*?\]),', webpage, 'video URLs')
+ sources_json = re.sub(r'\s([a-z]+):\s', r'"\1": ', sources_raw)
+ sources = json.loads(sources_json)
+
+ formats = [{
+ 'format_note': s.get('label'),
+ 'url': s['file'],
+ } for s in sources]
+ self._sort_formats(formats)
video_title = self._og_search_title(webpage).replace('LiveLeak.com -', '').strip()
video_description = self._og_search_description(webpage)
video_title = self._og_search_title(webpage).replace('LiveLeak.com -', '').strip()
video_description = self._og_search_description(webpage)
@@
-36,9
+45,8
@@
class LiveLeakIE(InfoExtractor):
return {
'id': video_id,
return {
'id': video_id,
- 'url': video_url,
- 'ext': 'mp4',
'title': video_title,
'description': video_description,
'title': video_title,
'description': video_description,
- 'uploader': video_uploader
+ 'uploader': video_uploader,
+ 'formats': formats,
}
}