From 4f9d37aba2266f1f77ae188b50edd5830c40a681 Mon Sep 17 00:00:00 2001 From: Alex Seiler Date: Fri, 20 Oct 2017 17:05:40 +0200 Subject: [PATCH 1/2] [ParliamentLiveUK] Fixed extractor --- youtube_dl/extractor/parliamentliveuk.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/parliamentliveuk.py b/youtube_dl/extractor/parliamentliveuk.py index ebdab8db9..fdde36e68 100644 --- a/youtube_dl/extractor/parliamentliveuk.py +++ b/youtube_dl/extractor/parliamentliveuk.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals +import re from .common import InfoExtractor @@ -11,7 +12,7 @@ class ParliamentLiveUKIE(InfoExtractor): _TESTS = [{ 'url': 'http://parliamentlive.tv/Event/Index/c1e9d44d-fd6c-4263-b50f-97ed26cc998b', 'info_dict': { - 'id': 'c1e9d44d-fd6c-4263-b50f-97ed26cc998b', + 'id': '1_af9nv9ym', 'ext': 'mp4', 'title': 'Home Affairs Committee', 'uploader_id': 'FFMPEG-01', @@ -29,13 +30,13 @@ class ParliamentLiveUKIE(InfoExtractor): 'http://vodplayer.parliamentlive.tv/?mid=' + video_id, video_id) widget_config = self._parse_json(self._search_regex( r'kWidgetConfig\s*=\s*({.+});', - webpage, 'kaltura widget config'), video_id) - kaltura_url = 'kaltura:%s:%s' % (widget_config['wid'][1:], widget_config['entry_id']) + webpage, 'kaltura widget config', flags=re.DOTALL), video_id) + kaltura_url = 'kaltura:%s:%s' % ( + widget_config['wid'][1:], widget_config['entry_id']) event_title = self._download_json( 'http://parliamentlive.tv/Event/GetShareVideo/' + video_id, video_id)['event']['title'] return { '_type': 'url_transparent', - 'id': video_id, 'title': event_title, 'description': '', 'url': kaltura_url, From 408546b3834c3064c3d33ea5aab1e32916acb61b Mon Sep 17 00:00:00 2001 From: Alex Seiler Date: Fri, 20 Oct 2017 18:27:49 +0200 Subject: [PATCH 2/2] Move flags into regex. --- youtube_dl/extractor/parliamentliveuk.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/parliamentliveuk.py b/youtube_dl/extractor/parliamentliveuk.py index fdde36e68..bdd5ff565 100644 --- a/youtube_dl/extractor/parliamentliveuk.py +++ b/youtube_dl/extractor/parliamentliveuk.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -import re from .common import InfoExtractor @@ -29,8 +28,8 @@ class ParliamentLiveUKIE(InfoExtractor): webpage = self._download_webpage( 'http://vodplayer.parliamentlive.tv/?mid=' + video_id, video_id) widget_config = self._parse_json(self._search_regex( - r'kWidgetConfig\s*=\s*({.+});', - webpage, 'kaltura widget config', flags=re.DOTALL), video_id) + r'(?s)kWidgetConfig\s*=\s*({.+});', + webpage, 'kaltura widget config'), video_id) kaltura_url = 'kaltura:%s:%s' % ( widget_config['wid'][1:], widget_config['entry_id']) event_title = self._download_json(