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:
7234d1d
)
[nowness] Add support for brightcove:new videos (Closes #7884)
author
Sergey M․
<dstftw@gmail.com>
Fri, 18 Dec 2015 16:05:56 +0000
(22:05 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 18 Dec 2015 16:05:56 +0000
(22:05 +0600)
youtube_dl/extractor/nowness.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nowness.py
b/youtube_dl/extractor/nowness.py
index d480fb58c4695b29b370f54cd2bde747de04c8f1..446f5901c1701166fa1a345827d839a25f6d98af 100644
(file)
--- a/
youtube_dl/extractor/nowness.py
+++ b/
youtube_dl/extractor/nowness.py
@@
-1,7
+1,10
@@
# encoding: utf-8
from __future__ import unicode_literals
# encoding: utf-8
from __future__ import unicode_literals
-from .brightcove import BrightcoveLegacyIE
+from .brightcove import (
+ BrightcoveLegacyIE,
+ BrightcoveNewIE,
+)
from .common import InfoExtractor
from ..compat import compat_str
from ..utils import (
from .common import InfoExtractor
from ..compat import compat_str
from ..utils import (
@@
-23,9
+26,12
@@
class NownessBaseIE(InfoExtractor):
note='Downloading player JavaScript',
errnote='Unable to download player JavaScript')
bc_url = BrightcoveLegacyIE._extract_brightcove_url(player_code)
note='Downloading player JavaScript',
errnote='Unable to download player JavaScript')
bc_url = BrightcoveLegacyIE._extract_brightcove_url(player_code)
- if bc_url is None:
- raise ExtractorError('Could not find player definition')
- return self.url_result(bc_url, 'BrightcoveLegacy')
+ if bc_url:
+ return self.url_result(bc_url, BrightcoveLegacyIE.ie_key())
+ bc_url = BrightcoveNewIE._extract_url(player_code)
+ if bc_url:
+ return self.url_result(bc_url, BrightcoveNewIE.ie_key())
+ raise ExtractorError('Could not find player definition')
elif source == 'vimeo':
return self.url_result('http://vimeo.com/%s' % video_id, 'Vimeo')
elif source == 'youtube':
elif source == 'vimeo':
return self.url_result('http://vimeo.com/%s' % video_id, 'Vimeo')
elif source == 'youtube':