projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
05d5392
)
[ooyala] Extract m3u8 information (#2292)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Thu, 7 May 2015 10:12:01 +0000
(18:12 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Thu, 7 May 2015 10:12:01 +0000
(18:12 +0800)
youtube_dl/extractor/ooyala.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ooyala.py
b/youtube_dl/extractor/ooyala.py
index d5b05c18febb580a448263b4f7b2876ef3234957..b33e8230d8223351ab3a61a32cacb26ee0e51c1d 100644
(file)
--- a/
youtube_dl/extractor/ooyala.py
+++ b/
youtube_dl/extractor/ooyala.py
@@
-6,6
+6,7
@@
from .common import InfoExtractor
from ..utils import (
unescapeHTML,
ExtractorError,
from ..utils import (
unescapeHTML,
ExtractorError,
+ determine_ext,
)
)
@@
-44,11
+45,21
@@
class OoyalaIE(InfoExtractor):
ie=cls.ie_key())
def _extract_result(self, info, more_info):
ie=cls.ie_key())
def _extract_result(self, info, more_info):
+ embedCode = info['embedCode']
+ video_url = info.get('ipad_url') or info['url']
+
+ if determine_ext(video_url) == 'm3u8':
+ formats = self._extract_m3u8_formats(video_url, embedCode, ext='mp4')
+ else:
+ formats = [{
+ 'url': video_url,
+ 'ext': 'mp4',
+ }]
+
return {
return {
- 'id': info['embedCode'],
- 'ext': 'mp4',
+ 'id': embedCode,
'title': unescapeHTML(info['title']),
'title': unescapeHTML(info['title']),
- '
url': info.get('ipad_url') or info['url']
,
+ '
formats': formats
,
'description': unescapeHTML(more_info['description']),
'thumbnail': more_info['promo'],
}
'description': unescapeHTML(more_info['description']),
'thumbnail': more_info['promo'],
}