From 6a52eed80edbb0f1e65a74def32d84236ac6e640 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergey=20M=E2=80=A4?= Date: Sun, 7 Dec 2014 01:46:44 +0600 Subject: [PATCH] [prosiebensat1] Improve and simplify --- youtube_dl/extractor/prosiebensat1.py | 74 +++++++++++++-------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 8c9451f40..1262793c8 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -8,7 +8,6 @@ from .common import InfoExtractor from ..utils import ( compat_urllib_parse, unified_strdate, - ExtractorError, ) @@ -158,7 +157,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 +188,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=.+?