projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3f0b8e
)
[bbccouk] Make more robust (Closes #6345)
author
Sergey M․
<dstftw@gmail.com>
Thu, 23 Jul 2015 20:56:54 +0000
(
02:56
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 23 Jul 2015 20:56:54 +0000
(
02:56
+0600)
youtube_dl/extractor/bbccouk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/bbccouk.py
b/youtube_dl/extractor/bbccouk.py
index 5825d286774fa003d343f41c85e07e35340cb428..b2e5f741870bc2437e1e2c126b468303ae781dda 100644
(file)
--- a/
youtube_dl/extractor/bbccouk.py
+++ b/
youtube_dl/extractor/bbccouk.py
@@
-210,12
+210,12
@@
class BBCCoUkIE(InfoExtractor):
def _extract_video(self, media, programme_id):
formats = []
def _extract_video(self, media, programme_id):
formats = []
- vbr = int(media.get('bitrate'))
+ vbr = int
_or_none
(media.get('bitrate'))
vcodec = media.get('encoding')
service = media.get('service')
vcodec = media.get('encoding')
service = media.get('service')
- width = int(media.get('width'))
- height = int(media.get('height'))
- file_size = int(media.get('media_file_size'))
+ width = int
_or_none
(media.get('width'))
+ height = int
_or_none
(media.get('height'))
+ file_size = int
_or_none
(media.get('media_file_size'))
for connection in self._extract_connections(media):
conn_formats = self._extract_connection(connection, programme_id)
for format in conn_formats:
for connection in self._extract_connections(media):
conn_formats = self._extract_connection(connection, programme_id)
for format in conn_formats:
@@
-232,7
+232,7
@@
class BBCCoUkIE(InfoExtractor):
def _extract_audio(self, media, programme_id):
formats = []
def _extract_audio(self, media, programme_id):
formats = []
- abr = int(media.get('bitrate'))
+ abr = int
_or_none
(media.get('bitrate'))
acodec = media.get('encoding')
service = media.get('service')
for connection in self._extract_connections(media):
acodec = media.get('encoding')
service = media.get('service')
for connection in self._extract_connections(media):
@@
-300,7
+300,7
@@
class BBCCoUkIE(InfoExtractor):
if kind != 'programme' and kind != 'radioProgramme':
continue
programme_id = item.get('vpid')
if kind != 'programme' and kind != 'radioProgramme':
continue
programme_id = item.get('vpid')
- duration = int(item.get('duration'))
+ duration = int
_or_none
(item.get('duration'))
formats, subtitles = self._download_media_selector(programme_id)
return programme_id, title, description, duration, formats, subtitles
except ExtractorError as ee:
formats, subtitles = self._download_media_selector(programme_id)
return programme_id, title, description, duration, formats, subtitles
except ExtractorError as ee:
@@
-332,7
+332,7
@@
class BBCCoUkIE(InfoExtractor):
title = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}title').text
description = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}summary').text
programme_id = item.get('identifier')
title = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}title').text
description = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}summary').text
programme_id = item.get('identifier')
- duration = int(item.get('duration'))
+ duration = int
_or_none
(item.get('duration'))
formats, subtitles = self._download_media_selector(programme_id)
return programme_id, title, description, duration, formats, subtitles
formats, subtitles = self._download_media_selector(programme_id)
return programme_id, title, description, duration, formats, subtitles