projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[viidia] Cleaup
[youtube-dl]
/
youtube_dl
/
extractor
/
ustream.py
diff --git
a/youtube_dl/extractor/ustream.py
b/youtube_dl/extractor/ustream.py
index 9fdeb064d20cd1f4a64cd0891f04d8481f943066..73b05ecab82a10a6c80360b0b980f285dfbb9c45 100644
(file)
--- a/
youtube_dl/extractor/ustream.py
+++ b/
youtube_dl/extractor/ustream.py
@@
-1,6
+1,5
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import json
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
@@
-23,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
@@
-36,7
+39,8
@@
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):
}]
def _real_extract(self, url):
@@
-66,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')
@@
-95,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,