projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[brightcove] Add the extraction of the url from generic
[youtube-dl]
/
youtube_dl
/
extractor
/
bliptv.py
diff --git
a/youtube_dl/extractor/bliptv.py
b/youtube_dl/extractor/bliptv.py
index 37141e6a0a9016a39c9ef0f254c3e0599109baa5..493504f75082f7b7605121acbfd88dbb621e84fb 100644
(file)
--- a/
youtube_dl/extractor/bliptv.py
+++ b/
youtube_dl/extractor/bliptv.py
@@
-27,7
+27,7
@@
class BlipTVIE(InfoExtractor):
_TEST = {
u'url': u'http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352',
u'file': u'5779306.m4v',
_TEST = {
u'url': u'http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352',
u'file': u'5779306.m4v',
- u'md5': u'
b2d849efcf7ee18917e4b4d9ff37cafe
',
+ u'md5': u'
80baf1ec5c3d2019037c1c707d676b9f
',
u'info_dict': {
u"upload_date": u"20111205",
u"description": u"md5:9bc31f227219cde65e47eeec8d2dc596",
u'info_dict': {
u"upload_date": u"20111205",
u"description": u"md5:9bc31f227219cde65e47eeec8d2dc596",
@@
-103,14
+103,19
@@
class BlipTVIE(InfoExtractor):
data = json_data
upload_date = datetime.datetime.strptime(data['datestamp'], '%m-%d-%y %H:%M%p').strftime('%Y%m%d')
data = json_data
upload_date = datetime.datetime.strptime(data['datestamp'], '%m-%d-%y %H:%M%p').strftime('%Y%m%d')
- video_url = data['media']['url']
+ if 'additionalMedia' in data:
+ formats = sorted(data['additionalMedia'], key=lambda f: int(f['media_height']))
+ best_format = formats[-1]
+ video_url = best_format['url']
+ else:
+ video_url = data['media']['url']
umobj = re.match(self._URL_EXT, video_url)
if umobj is None:
raise ValueError('Can not determine filename extension')
ext = umobj.group(1)
info = {
umobj = re.match(self._URL_EXT, video_url)
if umobj is None:
raise ValueError('Can not determine filename extension')
ext = umobj.group(1)
info = {
- 'id':
data['item_id']
,
+ 'id':
compat_str(data['item_id'])
,
'url': video_url,
'uploader': data['display_name'],
'upload_date': upload_date,
'url': video_url,
'uploader': data['display_name'],
'upload_date': upload_date,
@@
-184,5
+189,5
@@
class BlipTVUserIE(InfoExtractor):
pagenum += 1
urls = [u'http://blip.tv/%s' % video_id for video_id in video_ids]
pagenum += 1
urls = [u'http://blip.tv/%s' % video_id for video_id in video_ids]
- url_entries = [self.url_result(
url, 'BlipTV') for
url in urls]
+ url_entries = [self.url_result(
vurl, 'BlipTV') for v
url in urls]
return [self.playlist_result(url_entries, playlist_title = username)]
return [self.playlist_result(url_entries, playlist_title = username)]