projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
573c352
)
[azubu] Don't fail on optional fields
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 18 Jun 2016 04:39:08 +0000
(12:39 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 18 Jun 2016 04:39:08 +0000
(12:39 +0800)
youtube_dl/extractor/azubu.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/azubu.py
b/youtube_dl/extractor/azubu.py
index efa624de1cbfddb741a7f8114059165d4e099095..a813eb429fe8168c2e4223342fd6540647fe127a 100644
(file)
--- a/
youtube_dl/extractor/azubu.py
+++ b/
youtube_dl/extractor/azubu.py
@@
-46,6
+46,7
@@
class AzubuIE(InfoExtractor):
'uploader_id': 272749,
'view_count': int,
},
'uploader_id': 272749,
'view_count': int,
},
+ 'skip': 'Channel offline',
},
]
},
]
@@
-56,22
+57,26
@@
class AzubuIE(InfoExtractor):
'http://www.azubu.tv/api/video/%s' % video_id, video_id)['data']
title = data['title'].strip()
'http://www.azubu.tv/api/video/%s' % video_id, video_id)['data']
title = data['title'].strip()
- description = data['description']
- thumbnail = data['thumbnail']
- view_count = data['view_count']
- uploader = data['user']['username']
- uploader_id = data['user']['id']
+ description = data.get('description')
+ thumbnail = data.get('thumbnail')
+ view_count = data.get('view_count')
+ user = data.get('user', {})
+ uploader = user.get('username')
+ uploader_id = user.get('id')
stream_params = json.loads(data['stream_params'])
stream_params = json.loads(data['stream_params'])
- timestamp = float_or_none(stream_params
['creationDate']
, 1000)
- duration = float_or_none(stream_params
['length']
, 1000)
+ timestamp = float_or_none(stream_params
.get('creationDate')
, 1000)
+ duration = float_or_none(stream_params
.get('length')
, 1000)
renditions = stream_params.get('renditions') or []
video = stream_params.get('FLVFullLength') or stream_params.get('videoFullLength')
if video:
renditions.append(video)
renditions = stream_params.get('renditions') or []
video = stream_params.get('FLVFullLength') or stream_params.get('videoFullLength')
if video:
renditions.append(video)
+ if not renditions and not user.get('channel', {}).get('is_live', True):
+ raise ExtractorError('%s said: channel is offline.' % self.IE_NAME, expected=True)
+
formats = [{
'url': fmt['url'],
'width': fmt['frameWidth'],
formats = [{
'url': fmt['url'],
'width': fmt['frameWidth'],