aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-08-22 00:06:39 +0100
committerRemita Amine <remitamine@gmail.com>2016-08-22 00:07:17 +0100
commit55d119e2a10ccbfadc12b9af30c495f46874c2a3 (patch)
treec1c9ea2d737b37771e8555e51b5442f07dbf5e61
parent6d2679ee26eb6ad0587d01e40ca7a17a6edd6e2a (diff)
[abc:iview] Add new extractor(closes #6148)
-rw-r--r--youtube_dl/extractor/abc.py63
-rw-r--r--youtube_dl/extractor/extractors.py5
2 files changed, 67 insertions, 1 deletions
diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py
index b584277be..879ded88d 100644
--- a/youtube_dl/extractor/abc.py
+++ b/youtube_dl/extractor/abc.py
@@ -7,6 +7,8 @@ from ..utils import (
ExtractorError,
js_to_json,
int_or_none,
+ update_url_query,
+ parse_iso8601,
)
@@ -93,3 +95,64 @@ class ABCIE(InfoExtractor):
'description': self._og_search_description(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
}
+
+
+class ABCIViewIE(InfoExtractor):
+ IE_NAME = 'abc.net.au:iview'
+ _VALID_URL = r'https?://iview\.abc\.net\.au/programs/[^/]+/(?P<id>[^/?#]+)'
+
+ _TESTS = [{
+ 'url': 'http://iview.abc.net.au/programs/gardening-australia/FA1505V024S00',
+ 'md5': '979d10b2939101f0d27a06b79edad536',
+ 'info_dict': {
+ 'id': 'FA1505V024S00',
+ 'ext': 'mp4',
+ 'title': 'Series 27 Ep 24',
+ 'description': 'md5:b28baeae7504d1148e1d2f0e3ed3c15d',
+ 'upload_date': '20160820',
+ 'uploader_id': 'abc1',
+ 'timestamp': 1471719600,
+ },
+ }]
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(url, video_id)
+ video_params = self._parse_json(self._search_regex(
+ r'videoParams\s*=\s*({.+?});', webpage, 'video params'), video_id)
+ title = video_params['title']
+ stream = next(s for s in video_params['playlist'] if s.get('type') == 'program')
+
+ formats = []
+ f4m_url = stream.get('hds-unmetered') or stream['hds-metered']
+ formats.extend(self._extract_f4m_formats(
+ update_url_query(f4m_url, {'hdcore': '3.7.0'}),
+ video_id, f4m_id='hds', fatal=False))
+ formats.extend(self._extract_m3u8_formats(f4m_url.replace(
+ 'akamaihd.net/z/', 'akamaihd.net/i/').replace('/manifest.f4m', '/master.m3u8'),
+ video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
+ self._sort_formats(formats)
+
+ subtitles = {}
+ src_vtt = stream.get('captions', {}).get('src-vtt')
+ if src_vtt:
+ subtitles['en'] = [{
+ 'url': src_vtt,
+ 'ext': 'vtt',
+ }]
+
+ return {
+ 'id': video_id,
+ 'title': title,
+ 'description': self._html_search_meta(['og:description', 'twitter:description'], webpage),
+ 'thumbnail': self._html_search_meta(['og:image', 'twitter:image:src'], webpage),
+ 'duration': int_or_none(video_params.get('eventDuration')),
+ 'timestamp': parse_iso8601(video_params.get('pubDate'), ' '),
+ 'series': video_params.get('seriesTitle'),
+ 'series_id': video_params.get('seriesHouseNumber') or video_id[:7],
+ 'episode_number': int_or_none(self._html_search_meta('episodeNumber', webpage)),
+ 'episode': self._html_search_meta('episode_title', webpage),
+ 'uploader_id': video_params.get('channel'),
+ 'formats': formats,
+ 'subtitles': subtitles,
+ }
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index b0644be11..8e405ad72 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1,7 +1,10 @@
# flake8: noqa
from __future__ import unicode_literals
-from .abc import ABCIE
+from .abc import (
+ ABCIE,
+ ABCIViewIE,
+)
from .abc7news import Abc7NewsIE
from .abcnews import (
AbcNewsIE,