projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e721d85
)
[brightcove] Fix _extract_urls
author
Sergey M․
<dstftw@gmail.com>
Sat, 14 Nov 2015 00:01:56 +0000
(06:01 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 14 Nov 2015 00:01:56 +0000
(06:01 +0600)
youtube_dl/extractor/brightcove.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/brightcove.py
b/youtube_dl/extractor/brightcove.py
index 8ee5486fed60e7456ab2e69bbdb494d1ae9c0014..1c7783dcb25348b63c0cba5a62e0b9b0981cee13 100644
(file)
--- a/
youtube_dl/extractor/brightcove.py
+++ b/
youtube_dl/extractor/brightcove.py
@@
-372,7
+372,8
@@
class BrightcoveNewIE(InfoExtractor):
}
}
}
}
- def _extract_urls(self, webpage):
+ @staticmethod
+ def _extract_urls(webpage):
# Reference:
# 1. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideoiniframe
# 2. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideousingjavascript)
# Reference:
# 1. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideoiniframe
# 2. http://docs.brightcove.com/en/video-cloud/brightcove-player/guides/publish-video.html#setvideousingjavascript)
@@
-383,7
+384,7
@@
class BrightcoveNewIE(InfoExtractor):
# Look for iframe embeds [1]
for _, url in re.findall(
r'<iframe[^>]+src=(["\'])((?:https?:)//players\.brightcove\.net/\d+/[^/]+/index\.html.+?)\1', webpage):
# Look for iframe embeds [1]
for _, url in re.findall(
r'<iframe[^>]+src=(["\'])((?:https?:)//players\.brightcove\.net/\d+/[^/]+/index\.html.+?)\1', webpage):
- entries.append(
self.url_result(self._proto_relative_url(url))
)
+ entries.append(
url
)
# Look for embed_in_page embeds [2]
# According to examples from [3] it's unclear whether video id may be optional
# and what to do when it is
# Look for embed_in_page embeds [2]
# According to examples from [3] it's unclear whether video id may be optional
# and what to do when it is
@@
-396,9
+397,9
@@
class BrightcoveNewIE(InfoExtractor):
src=["\'](?:https?:)?//players\.brightcove\.net/
(\d+)/([\da-f-]+)_([^/]+)/index\.min\.js
''', webpage):
src=["\'](?:https?:)?//players\.brightcove\.net/
(\d+)/([\da-f-]+)_([^/]+)/index\.min\.js
''', webpage):
- entries.append(
self.url_result(
+ entries.append(
'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
- % (account_id, player_id, embed, video_id))
)
+ % (account_id, player_id, embed, video_id))
return entries
def _real_extract(self, url):
return entries
def _real_extract(self, url):