aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M <dstftw@gmail.com>2016-01-16 07:20:15 +0600
committerSergey M <dstftw@gmail.com>2016-01-16 07:20:15 +0600
commitac25992bc74dec638cb33e8da088c325a03036a5 (patch)
treed1eec6fb22fed295616024d16fa104c520cc1d23
parent30783c442de27dbab9f76a6293906daa8fa788d9 (diff)
parentb4e44234bc481747b88c330b0e30a13dbc0fc99a (diff)
downloadyoutube-dl-ac25992bc74dec638cb33e8da088c325a03036a5.tar.xz
Merge pull request #8246 from dstftw/initial-json-ld-metadata-support
Initial JSON-LD metadata extraction support
-rw-r--r--youtube_dl/extractor/ae.py7
-rw-r--r--youtube_dl/extractor/common.py37
2 files changed, 43 insertions, 1 deletions
diff --git a/youtube_dl/extractor/ae.py b/youtube_dl/extractor/ae.py
index a3b9f1ca4..3bc7c12fc 100644
--- a/youtube_dl/extractor/ae.py
+++ b/youtube_dl/extractor/ae.py
@@ -55,4 +55,9 @@ class AEIE(InfoExtractor):
]
video_url = self._search_regex(video_url_re, webpage, 'video url')
- return self.url_result(smuggle_url(video_url, {'sig': {'key': 'crazyjava', 'secret': 's3cr3t'}}))
+ info = self._search_json_ld(webpage, video_id, fatal=False)
+ info.update({
+ '_type': 'url_transparent',
+ 'url': smuggle_url(video_url, {'sig': {'key': 'crazyjava', 'secret': 's3cr3t'}}),
+ })
+ return info
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index b05b22a94..92e2e4f43 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -34,6 +34,7 @@ from ..utils import (
fix_xml_ampersands,
float_or_none,
int_or_none,
+ parse_iso8601,
RegexNotFoundError,
sanitize_filename,
sanitized_Request,
@@ -762,6 +763,42 @@ class InfoExtractor(object):
return self._html_search_meta('twitter:player', html,
'twitter card player')
+ def _search_json_ld(self, html, video_id, fatal=True):
+ json_ld = self._search_regex(
+ r'(?s)<script[^>]+type=(["\'])application/ld\+json\1[^>]*>(?P<json_ld>.+?)</script>',
+ html, 'JSON-LD', fatal=fatal, group='json_ld')
+ if not json_ld:
+ return {}
+ return self._json_ld(json_ld, video_id, fatal=fatal)
+
+ def _json_ld(self, json_ld, video_id, fatal=True):
+ if isinstance(json_ld, compat_str):
+ json_ld = self._parse_json(json_ld, video_id, fatal=fatal)
+ if not json_ld:
+ return {}
+ info = {}
+ if json_ld.get('@context') == 'http://schema.org':
+ item_type = json_ld.get('@type')
+ if item_type == 'TVEpisode':
+ info.update({
+ 'episode': unescapeHTML(json_ld.get('name')),
+ 'episode_number': int_or_none(json_ld.get('episodeNumber')),
+ 'description': unescapeHTML(json_ld.get('description')),
+ })
+ part_of_season = json_ld.get('partOfSeason')
+ if isinstance(part_of_season, dict) and part_of_season.get('@type') == 'TVSeason':
+ info['season_number'] = int_or_none(part_of_season.get('seasonNumber'))
+ part_of_series = json_ld.get('partOfSeries')
+ if isinstance(part_of_series, dict) and part_of_series.get('@type') == 'TVSeries':
+ info['series'] = unescapeHTML(part_of_series.get('name'))
+ elif item_type == 'Article':
+ info.update({
+ 'timestamp': parse_iso8601(json_ld.get('datePublished')),
+ 'title': unescapeHTML(json_ld.get('headline')),
+ 'description': unescapeHTML(json_ld.get('articleBody')),
+ })
+ return dict((k, v) for k, v in info.items() if v is not None)
+
@staticmethod
def _hidden_inputs(html):
html = re.sub(r'<!--(?:(?!<!--).)*-->', '', html)