projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a26a3c6
)
[parliamentliveuk] Fix extraction (closes #14524)
author
Alex Seiler
<seileralex@gmail.com>
Fri, 20 Oct 2017 16:31:13 +0000
(18:31 +0200)
committer
Sergey M
<dstftw@gmail.com>
Fri, 20 Oct 2017 16:31:13 +0000
(23:31 +0700)
youtube_dl/extractor/parliamentliveuk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/parliamentliveuk.py
b/youtube_dl/extractor/parliamentliveuk.py
index ebdab8db9faa0c8911c53c5764a18456926b6a55..bdd5ff565443d7353e64427b99e0edf60e75bd0c 100644
(file)
--- a/
youtube_dl/extractor/parliamentliveuk.py
+++ b/
youtube_dl/extractor/parliamentliveuk.py
@@
-11,7
+11,7
@@
class ParliamentLiveUKIE(InfoExtractor):
_TESTS = [{
'url': 'http://parliamentlive.tv/Event/Index/c1e9d44d-fd6c-4263-b50f-97ed26cc998b',
'info_dict': {
_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',
'ext': 'mp4',
'title': 'Home Affairs Committee',
'uploader_id': 'FFMPEG-01',
@@
-28,14
+28,14
@@
class ParliamentLiveUKIE(InfoExtractor):
webpage = self._download_webpage(
'http://vodplayer.parliamentlive.tv/?mid=' + video_id, video_id)
widget_config = self._parse_json(self._search_regex(
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*({.+});',
+ r'
(?s)
kWidgetConfig\s*=\s*({.+});',
webpage, 'kaltura widget config'), video_id)
webpage, 'kaltura widget config'), video_id)
- kaltura_url = 'kaltura:%s:%s' % (widget_config['wid'][1:], widget_config['entry_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',
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,
'title': event_title,
'description': '',
'url': kaltura_url,