ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-20 03:54:01 +00:00
Code Issues Projects Releases Wiki Activity

[abc.net.au:iview] Fix for non-series videos (closes #10895)

Browse Source
This commit is contained in:
Yen Chi Hsuan 2016-10-11 12:53:27 +08:00
parent 27b8d2ee95
commit f165ca70eb
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ Core
* [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387) * [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387)
Extractors Extractors
* [abc.net.au:iview] Fix for standalone (non series) videos (#10895)
+ [hbo] Add support for episode pages (#10892) + [hbo] Add support for episode pages (#10892)
* [allocine] Fix extraction (#10860) * [allocine] Fix extraction (#10860)
+ [nextmedia] Recognize action news on AppleDaily + [nextmedia] Recognize action news on AppleDaily

22
youtube_dl/extractor/abc.py
View File

@ -102,16 +102,16 @@ class ABCIViewIE(InfoExtractor):
# ABC iview programs are normally available for 14 days only. # ABC iview programs are normally available for 14 days only.
_TESTS = [{ _TESTS = [{
'url': 'http://iview.abc.net.au/programs/gardening-australia/FA1505V024S00', 'url': 'http://iview.abc.net.au/programs/diaries-of-a-broken-mind/ZX9735A001S00',
'md5': '979d10b2939101f0d27a06b79edad536', 'md5': 'cde42d728b3b7c2b32b1b94b4a548afc',
'info_dict': { 'info_dict': {
'id': 'FA1505V024S00', 'id': 'ZX9735A001S00',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Series 27 Ep 24', 'title': 'Diaries Of A Broken Mind',
'description': 'md5:b28baeae7504d1148e1d2f0e3ed3c15d', 'description': 'md5:7de3903874b7a1be279fe6b68718fc9e',
'upload_date': '20160820', 'upload_date': '20161010',
'uploader_id': 'abc1', 'uploader_id': 'abc2',
'timestamp': 1471719600, 'timestamp': 1476064920,
}, },
'skip': 'Video gone', 'skip': 'Video gone',
}] }]
@ -121,7 +121,7 @@ class ABCIViewIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
video_params = self._parse_json(self._search_regex( video_params = self._parse_json(self._search_regex(
r'videoParams\s*=\s*({.+?});', webpage, 'video params'), video_id) r'videoParams\s*=\s*({.+?});', webpage, 'video params'), video_id)
title = video_params['title'] title = video_params.get('title') or video_params['seriesTitle']
stream = next(s for s in video_params['playlist'] if s.get('type') == 'program') stream = next(s for s in video_params['playlist'] if s.get('type') == 'program')
formats = self._extract_akamai_formats(stream['hds-unmetered'], video_id) formats = self._extract_akamai_formats(stream['hds-unmetered'], video_id)
@ -144,8 +144,8 @@ class ABCIViewIE(InfoExtractor):
'timestamp': parse_iso8601(video_params.get('pubDate'), ' '), 'timestamp': parse_iso8601(video_params.get('pubDate'), ' '),
'series': video_params.get('seriesTitle'), 'series': video_params.get('seriesTitle'),
'series_id': video_params.get('seriesHouseNumber') or video_id[:7], 'series_id': video_params.get('seriesHouseNumber') or video_id[:7],
'episode_number': int_or_none(self._html_search_meta('episodeNumber', webpage)), 'episode_number': int_or_none(self._html_search_meta('episodeNumber', webpage, default=None)),
'episode': self._html_search_meta('episode_title', webpage), 'episode': self._html_search_meta('episode_title', webpage, default=None),
'uploader_id': video_params.get('channel'), 'uploader_id': video_params.get('channel'),
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,