projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[README.md:output_template] Add example for channel/user playlists download
[youtube-dl]
/
youtube_dl
/
extractor
/
ustream.py
diff --git
a/youtube_dl/extractor/ustream.py
b/youtube_dl/extractor/ustream.py
index 7243d0eca764854630e42e2b81f48b2d8c55db70..b5fe753d7115923d16ed6cf7de34c8723368f82f 100644
(file)
--- a/
youtube_dl/extractor/ustream.py
+++ b/
youtube_dl/extractor/ustream.py
@@
-22,8
+22,12
@@
class UstreamIE(InfoExtractor):
'info_dict': {
'id': '20274954',
'ext': 'flv',
'info_dict': {
'id': '20274954',
'ext': 'flv',
- 'uploader': 'Young Americans for Liberty',
'title': 'Young Americans for Liberty February 7, 2012 2:28 AM',
'title': 'Young Americans for Liberty February 7, 2012 2:28 AM',
+ 'description': 'Young Americans for Liberty February 7, 2012 2:28 AM',
+ 'timestamp': 1328577035,
+ 'upload_date': '20120207',
+ 'uploader': 'yaliberty',
+ 'uploader_id': '6780869',
},
}, {
# From http://sportscanada.tv/canadagames/index.php/week2/figure-skating/444
},
}, {
# From http://sportscanada.tv/canadagames/index.php/week2/figure-skating/444
@@
-35,14
+39,15
@@
class UstreamIE(InfoExtractor):
'ext': 'flv',
'title': '-CG11- Canada Games Figure Skating',
'uploader': 'sportscanadatv',
'ext': 'flv',
'title': '-CG11- Canada Games Figure Skating',
'uploader': 'sportscanadatv',
- }
+ },
+ 'skip': 'This Pro Broadcaster has chosen to remove this video from the ustream.tv site.',
}]
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)
video_id = m.group('id')
}]
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)
video_id = m.group('id')
- # some sites use this embed format (see: http://github.com/rg3/youtube-dl/issues/2990)
+ # some sites use this embed format (see: http
s
://github.com/rg3/youtube-dl/issues/2990)
if m.group('type') == 'embed/recorded':
video_id = m.group('id')
desktop_url = 'http://www.ustream.tv/recorded/' + video_id
if m.group('type') == 'embed/recorded':
video_id = m.group('id')
desktop_url = 'http://www.ustream.tv/recorded/' + video_id
@@
-65,18
+70,20
@@
class UstreamIE(InfoExtractor):
video = params['video']
video = params['video']
+ title = video['title']
+ filesize = float_or_none(video.get('file_size'))
+
formats = [{
formats = [{
- 'id':
format
_id,
+ 'id':
video
_id,
'url': video_url,
'ext': format_id,
'url': video_url,
'ext': format_id,
+ 'filesize': filesize,
} for format_id, video_url in video['media_urls'].items()]
self._sort_formats(formats)
} for format_id, video_url in video['media_urls'].items()]
self._sort_formats(formats)
- title = video['title']
description = video.get('description')
timestamp = int_or_none(video.get('created_at'))
duration = float_or_none(video.get('length'))
description = video.get('description')
timestamp = int_or_none(video.get('created_at'))
duration = float_or_none(video.get('length'))
- filesize = float_or_none(video.get('file_size'))
view_count = int_or_none(video.get('views'))
uploader = video.get('owner', {}).get('username')
view_count = int_or_none(video.get('views'))
uploader = video.get('owner', {}).get('username')
@@
-94,7
+101,6
@@
class UstreamIE(InfoExtractor):
'thumbnails': thumbnails,
'timestamp': timestamp,
'duration': duration,
'thumbnails': thumbnails,
'timestamp': timestamp,
'duration': duration,
- 'filesize': filesize,
'view_count': view_count,
'uploader': uploader,
'uploader_id': uploader_id,
'view_count': view_count,
'uploader': uploader,
'uploader_id': uploader_id,