projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[iprima] Comply with review
[youtube-dl]
/
youtube_dl
/
extractor
/
prosiebensat1.py
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index 385681d06e3dda356193d9f89c7ccbdd4cbde453..255d4abc131519ec470ccdc2b1a64b7d38d9f44b 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-10,13
+10,14
@@
from ..compat import (
)
from ..utils import (
unified_strdate,
)
from ..utils import (
unified_strdate,
+ int_or_none,
)
class ProSiebenSat1IE(InfoExtractor):
IE_NAME = 'prosiebensat1'
IE_DESC = 'ProSiebenSat.1 Digital'
)
class ProSiebenSat1IE(InfoExtractor):
IE_NAME = 'prosiebensat1'
IE_DESC = 'ProSiebenSat.1 Digital'
- _VALID_URL = r'https?://(?:www\.)?(?:(?:prosieben|prosiebenmaxx|sixx|sat1|kabeleins|
ran|the-voice-of-germany)
\.de|fem\.com)/(?P<id>.+)'
+ _VALID_URL = r'https?://(?:www\.)?(?:(?:prosieben|prosiebenmaxx|sixx|sat1|kabeleins|
the-voice-of-germany)\.(?:de|at)|ran
\.de|fem\.com)/(?P<id>.+)'
_TESTS = [
{
_TESTS = [
{
@@
-24,7
+25,7
@@
class ProSiebenSat1IE(InfoExtractor):
'info_dict': {
'id': '2104602',
'ext': 'mp4',
'info_dict': {
'id': '2104602',
'ext': 'mp4',
- 'title': '
Staffel 2, Episode 18 - Jahresrückblick
',
+ 'title': '
Episode 18 - Staffel 2
',
'description': 'md5:8733c81b702ea472e069bc48bb658fc1',
'upload_date': '20131231',
'duration': 5845.04,
'description': 'md5:8733c81b702ea472e069bc48bb658fc1',
'upload_date': '20131231',
'duration': 5845.04,
@@
-266,6
+267,9
@@
class ProSiebenSat1IE(InfoExtractor):
urls_sources = urls_sources.values()
def fix_bitrate(bitrate):
urls_sources = urls_sources.values()
def fix_bitrate(bitrate):
+ bitrate = int_or_none(bitrate)
+ if not bitrate:
+ return None
return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate
for source in urls_sources:
return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate
for source in urls_sources: