X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fprosiebensat1.py;h=7cc7996642cae1de1ca2a585391d167025b92162;hb=60bf45c80d377a38b00b9ec1426c4cc1d9003742;hp=8c9451f4053036e0575ed5551b137fe6d168b166;hpb=8d1c8cae9ce9027058d90b246b9fa30ea88602ef;p=youtube-dl
diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 8c9451f40..7cc799664 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -5,10 +5,12 @@ import re
from hashlib import sha1
from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
compat_urllib_parse,
+)
+from ..utils import (
unified_strdate,
- ExtractorError,
+ int_or_none,
)
@@ -23,7 +25,7 @@ class ProSiebenSat1IE(InfoExtractor):
'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,
@@ -158,7 +160,7 @@ class ProSiebenSat1IE(InfoExtractor):
'info_dict': {
'id': '439664',
'title': 'Episode 8 - Ganze Folge - Playlist',
- 'description': 'Das finale und härteste Duell aller Zeiten ist vorbei! Der Weltmeister für dieses Jahr steht! Alle packenden Duelle der achten Episode von "Joko gegen Klaas - das Duell um die Welt" seht ihr hier noch einmal in voller Länge!',
+ 'description': 'md5:63b8963e71f481782aeea877658dec84',
},
'playlist_count': 2,
},
@@ -189,48 +191,19 @@ class ProSiebenSat1IE(InfoExtractor):
r'(\d{2}\.\d{2}\.\d{4})',
r'(\d{2}\.\d{2}\.\d{4}) \| \d{2}:\d{2} Min
',
]
- _ITEM_TYPE_REGEXES = [
+ _PAGE_TYPE_REGEXES = [
+ r'',
r"'itemType'\s*:\s*'([^']*)'",
]
- _ITEM_ID_REGEXES = [
+ _PLAYLIST_ID_REGEXES = [
+ r'content[iI]d=(\d+)',
r"'itemId'\s*:\s*'([^']*)'",
]
- _PLAYLIST_CLIPS_REGEXES = [
- r'data-qvt=.+?