Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-20 22:33:01 +08:00
Code Issues Releases Wiki Activity

[aenetworks] extract more formats(closes #11321)

Browse Source
This commit is contained in:
Remita Amine 2016-12-01 12:15:35 +01:00
parent d17bfe4095
commit a94e7f4a0c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/aenetworks.py
View File

@ -26,7 +26,7 @@ class AENetworksIE(AENetworksBaseIE):
_VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:history|aetv|mylifetime)\.com|fyi\.tv)/(?:shows/(?P<show_path>[^/]+(?:/[^/]+){0,2})|movies/(?P<movie_display_id>[^/]+)/full-movie)' _VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:history|aetv|mylifetime)\.com|fyi\.tv)/(?:shows/(?P<show_path>[^/]+(?:/[^/]+){0,2})|movies/(?P<movie_display_id>[^/]+)/full-movie)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.history.com/shows/mountain-men/season-1/episode-1', 'url': 'http://www.history.com/shows/mountain-men/season-1/episode-1',
'md5': '8ff93eb073449f151d6b90c0ae1ef0c7', 'md5': 'a97a65f7e823ae10e9244bc5433d5fe6',
'info_dict': { 'info_dict': {
'id': '22253814', 'id': '22253814',
'ext': 'mp4', 'ext': 'mp4',
@ -99,7 +99,7 @@ class AENetworksIE(AENetworksBaseIE):
query = { query = {
'mbr': 'true', 'mbr': 'true',
'assetTypes': 'medium_video_s3' 'assetTypes': 'high_video_s3'
} }
video_id = self._html_search_meta('aetn:VideoID', webpage) video_id = self._html_search_meta('aetn:VideoID', webpage)
media_url = self._search_regex( media_url = self._search_regex(
@ -155,7 +155,7 @@ class HistoryTopicIE(AENetworksBaseIE):
'id': 'world-war-i-history', 'id': 'world-war-i-history',
'title': 'World War I History', 'title': 'World War I History',
}, },
'playlist_mincount': 24, 'playlist_mincount': 23,
}, { }, {
'url': 'http://www.history.com/topics/world-war-i-history/videos', 'url': 'http://www.history.com/topics/world-war-i-history/videos',
'only_matching': True, 'only_matching': True,
@ -193,7 +193,8 @@ class HistoryTopicIE(AENetworksBaseIE):
return self.theplatform_url_result( return self.theplatform_url_result(
release_url, video_id, { release_url, video_id, {
'mbr': 'true', 'mbr': 'true',
'switch': 'hls' 'switch': 'hls',
'assetTypes': 'high_video_ak',
}) })
else: else:
webpage = self._download_webpage(url, topic_id) webpage = self._download_webpage(url, topic_id)
@ -203,6 +204,7 @@ class HistoryTopicIE(AENetworksBaseIE):
entries.append(self.theplatform_url_result( entries.append(self.theplatform_url_result(
video_attributes['data-release-url'], video_attributes['data-id'], { video_attributes['data-release-url'], video_attributes['data-id'], {
'mbr': 'true', 'mbr': 'true',
'switch': 'hls' 'switch': 'hls',
'assetTypes': 'high_video_ak',
})) }))
return self.playlist_result(entries, topic_id, get_element_by_attribute('class', 'show-title', webpage)) return self.playlist_result(entries, topic_id, get_element_by_attribute('class', 'show-title', webpage))