projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e445850
)
[ard] Add support for lives (closes #13771)
author
Sergey M․
<dstftw@gmail.com>
Sat, 29 Jul 2017 16:07:28 +0000
(23:07 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 29 Jul 2017 16:07:28 +0000
(23:07 +0700)
youtube_dl/extractor/ard.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ard.py
b/youtube_dl/extractor/ard.py
index 2d5599456688eba9756e28c2ffe9dbae48decb2c..3f248b14728ab3655a2e17f7b38a95184042d770 100644
(file)
--- a/
youtube_dl/extractor/ard.py
+++ b/
youtube_dl/extractor/ard.py
@@
-93,6
+93,7
@@
class ARDMediathekIE(InfoExtractor):
duration = int_or_none(media_info.get('_duration'))
thumbnail = media_info.get('_previewImage')
duration = int_or_none(media_info.get('_duration'))
thumbnail = media_info.get('_previewImage')
+ is_live = media_info.get('_isLive') is True
subtitles = {}
subtitle_url = media_info.get('_subtitleUrl')
subtitles = {}
subtitle_url = media_info.get('_subtitleUrl')
@@
-106,6
+107,7
@@
class ARDMediathekIE(InfoExtractor):
'id': video_id,
'duration': duration,
'thumbnail': thumbnail,
'id': video_id,
'duration': duration,
'thumbnail': thumbnail,
+ 'is_live': is_live,
'formats': formats,
'subtitles': subtitles,
}
'formats': formats,
'subtitles': subtitles,
}
@@
-166,9
+168,11
@@
class ARDMediathekIE(InfoExtractor):
# determine video id from url
m = re.match(self._VALID_URL, url)
# determine video id from url
m = re.match(self._VALID_URL, url)
+ document_id = None
+
numid = re.search(r'documentId=([0-9]+)', url)
if numid:
numid = re.search(r'documentId=([0-9]+)', url)
if numid:
- video_id = numid.group(1)
+
document_id =
video_id = numid.group(1)
else:
video_id = m.group('video_id')
else:
video_id = m.group('video_id')
@@
-228,12
+232,16
@@
class ARDMediathekIE(InfoExtractor):
'formats': formats,
}
else: # request JSON file
'formats': formats,
}
else: # request JSON file
+ if not document_id:
+ video_id = self._search_regex(
+ r'/play/(?:config|media)/(\d+)', webpage, 'media id')
info = self._extract_media_info(
info = self._extract_media_info(
- 'http://www.ardmediathek.de/play/media/%s' % video_id, webpage, video_id)
+ 'http://www.ardmediathek.de/play/media/%s' % video_id,
+ webpage, video_id)
info.update({
'id': video_id,
info.update({
'id': video_id,
- 'title': title,
+ 'title':
self._live_title(title) if info.get('is_live') else
title,
'description': description,
'thumbnail': thumbnail,
})
'description': description,
'thumbnail': thumbnail,
})