projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dramafever] Fix subtitles extraction (Closes #8049)
[youtube-dl]
/
youtube_dl
/
extractor
/
prosiebensat1.py
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index 0739234c6a0aa0eaffbd96ef3b4401d9200918bd..baa54a3afd10244ef2cda281c0785b24fe19e9cb 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-11,6
+11,7
@@
from ..compat import (
from ..utils import (
ExtractorError,
determine_ext,
from ..utils import (
ExtractorError,
determine_ext,
+ float_or_none,
int_or_none,
unified_strdate,
)
int_or_none,
unified_strdate,
)
@@
-19,7
+20,7
@@
from ..utils import (
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|the-voice-of-germany)\.(?:de|at)|ran\.de|fem\.com)/(?P<id>.+)'
+ _VALID_URL = r'https?://(?:www\.)?(?:(?:prosieben|prosiebenmaxx|sixx|sat1|kabeleins|the-voice-of-germany)\.(?:de|at
|ch
)|ran\.de|fem\.com)/(?P<id>.+)'
_TESTS = [
{
_TESTS = [
{
@@
-230,7
+231,7
@@
class ProSiebenSat1IE(InfoExtractor):
if video.get('is_protected') is True:
raise ExtractorError('This video is DRM protected.', expected=True)
if video.get('is_protected') is True:
raise ExtractorError('This video is DRM protected.', expected=True)
- duration = float
(video['duration']
)
+ duration = float
_or_none(video.get('duration')
)
source_ids = [source['id'] for source in video['sources']]
source_ids_str = ','.join(map(str, source_ids))
source_ids = [source['id'] for source in video['sources']]
source_ids_str = ','.join(map(str, source_ids))