projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[chilloutzone] Simplify (#2338)
[youtube-dl]
/
youtube_dl
/
extractor
/
ooyala.py
diff --git
a/youtube_dl/extractor/ooyala.py
b/youtube_dl/extractor/ooyala.py
index 1f7b4d2e7e9fa79ef9f81f71f190f943c35dd3a5..44312ba4ecf61220ad21e8d233a40e99960389b2 100644
(file)
--- a/
youtube_dl/extractor/ooyala.py
+++ b/
youtube_dl/extractor/ooyala.py
@@
-5,7
+5,7
@@
from .common import InfoExtractor
from ..utils import unescapeHTML
class OoyalaIE(InfoExtractor):
from ..utils import unescapeHTML
class OoyalaIE(InfoExtractor):
- _VALID_URL = r'https?://.+?\.ooyala\.com/.*?
embedCode
=(?P<id>.+?)(&|$)'
+ _VALID_URL = r'https?://.+?\.ooyala\.com/.*?
(?:embedCode|ec)
=(?P<id>.+?)(&|$)'
_TEST = {
# From http://it.slashdot.org/story/13/04/25/178216/recovering-data-from-broken-hard-drives-and-ssds-video
_TEST = {
# From http://it.slashdot.org/story/13/04/25/178216/recovering-data-from-broken-hard-drives-and-ssds-video
@@
-22,6
+22,11
@@
class OoyalaIE(InfoExtractor):
def _url_for_embed_code(embed_code):
return 'http://player.ooyala.com/player.js?embedCode=%s' % embed_code
def _url_for_embed_code(embed_code):
return 'http://player.ooyala.com/player.js?embedCode=%s' % embed_code
+ @classmethod
+ def _build_url_result(cls, embed_code):
+ return cls.url_result(cls._url_for_embed_code(embed_code),
+ ie=cls.ie_key())
+
def _extract_result(self, info, more_info):
return {'id': info['embedCode'],
'ext': 'mp4',
def _extract_result(self, info, more_info):
return {'id': info['embedCode'],
'ext': 'mp4',