projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction for domainless player URLs
[youtube-dl]
/
youtube_dl
/
extractor
/
prosiebensat1.py
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index a064de05e241d3f7b3c70030c19a4eee7a5b6496..03e1b1f7f3a8ee2668516c4a70ffcde070ae3716 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-85,6
+85,9
@@
class ProSiebenSat1BaseIE(InfoExtractor):
formats.extend(self._extract_m3u8_formats(
source_url, clip_id, 'mp4', 'm3u8_native',
m3u8_id='hls', fatal=False))
formats.extend(self._extract_m3u8_formats(
source_url, clip_id, 'mp4', 'm3u8_native',
m3u8_id='hls', fatal=False))
+ elif mimetype == 'application/dash+xml':
+ formats.extend(self._extract_mpd_formats(
+ source_url, clip_id, mpd_id='dash', fatal=False))
else:
tbr = fix_bitrate(source['bitrate'])
if protocol in ('rtmp', 'rtmpe'):
else:
tbr = fix_bitrate(source['bitrate'])
if protocol in ('rtmp', 'rtmpe'):
@@
-127,9
+130,9
@@
class ProSiebenSat1IE(ProSiebenSat1BaseIE):
(?:www\.)?
(?:
(?:
(?:www\.)?
(?:
(?:
- prosieben
|prosiebenmaxx|sixx|sat1(?:gold)?|kabeleins|the-voice-of-germany|7tv|kabeleinsdoku
+ prosieben
(?:maxx)?|sixx|sat1(?:gold)?|kabeleins(?:doku)?|the-voice-of-germany|7tv|advopedia
)\.(?:de|at|ch)|
)\.(?:de|at|ch)|
- ran\.de|fem\.com
+ ran\.de|fem\.com
|advopedia\.de
)
/(?P<id>.+)
'''
)
/(?P<id>.+)
'''
@@
-314,6
+317,10
@@
class ProSiebenSat1IE(ProSiebenSat1BaseIE):
'url': 'http://www.sat1gold.de/tv/edel-starck/playlist/die-gesamte-1-staffel',
'only_matching': True,
},
'url': 'http://www.sat1gold.de/tv/edel-starck/playlist/die-gesamte-1-staffel',
'only_matching': True,
},
+ {
+ 'url': 'http://www.advopedia.de/videos/lenssen-klaert-auf/lenssen-klaert-auf-folge-8-staffel-3-feiertage-und-freie-tage',
+ 'only_matching': True,
+ },
]
_TOKEN = 'prosieben'
]
_TOKEN = 'prosieben'
@@
-387,7
+394,7
@@
class ProSiebenSat1IE(ProSiebenSat1BaseIE):
self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')
playlist = self._parse_json(
self._search_regex(
self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')
playlist = self._parse_json(
self._search_regex(
- 'var\s+contentResources\s*=\s*(\[.+?\]);\s*</script',
+
r
'var\s+contentResources\s*=\s*(\[.+?\]);\s*</script',
webpage, 'playlist'),
playlist_id)
entries = []
webpage, 'playlist'),
playlist_id)
entries = []