projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ChangeLog] Actualize
[youtube-dl]
/
youtube_dl
/
extractor
/
canvas.py
diff --git
a/youtube_dl/extractor/canvas.py
b/youtube_dl/extractor/canvas.py
index 8ac62c1a680ccb0ab8a8c038bf0c7270c510d3e6..174fd9e2b4b00b384b1737a1df058050e4603de9 100644
(file)
--- a/
youtube_dl/extractor/canvas.py
+++ b/
youtube_dl/extractor/canvas.py
@@
-11,6
+11,7
@@
from ..utils import (
strip_or_none,
float_or_none,
int_or_none,
strip_or_none,
float_or_none,
int_or_none,
+ merge_dicts,
parse_iso8601,
)
parse_iso8601,
)
@@
-248,9
+249,13
@@
class VrtNUIE(GigyaBaseIE):
webpage, urlh = self._download_webpage_handle(url, display_id)
webpage, urlh = self._download_webpage_handle(url, display_id)
- title = self._html_search_regex(
+ info = self._search_json_ld(webpage, display_id, default={})
+
+ # title is optional here since it may be extracted by extractor
+ # that is delegated from here
+ title = strip_or_none(self._html_search_regex(
r'(?ms)<h1 class="content__heading">(.+?)</h1>',
r'(?ms)<h1 class="content__heading">(.+?)</h1>',
- webpage, 'title'
).strip(
)
+ webpage, 'title'
, default=None)
)
description = self._html_search_regex(
r'(?ms)<div class="content__description">(.+?)</div>',
description = self._html_search_regex(
r'(?ms)<div class="content__description">(.+?)</div>',
@@
-295,7
+300,7
@@
class VrtNUIE(GigyaBaseIE):
# the first one
video_id = list(video.values())[0].get('videoid')
# the first one
video_id = list(video.values())[0].get('videoid')
- return {
+ return
merge_dicts(info,
{
'_type': 'url_transparent',
'url': 'https://mediazone.vrt.be/api/v1/vrtvideo/assets/%s' % video_id,
'ie_key': CanvasIE.ie_key(),
'_type': 'url_transparent',
'url': 'https://mediazone.vrt.be/api/v1/vrtvideo/assets/%s' % video_id,
'ie_key': CanvasIE.ie_key(),
@@
-307,4
+312,4
@@
class VrtNUIE(GigyaBaseIE):
'season_number': season_number,
'episode_number': episode_number,
'release_date': release_date,
'season_number': season_number,
'episode_number': episode_number,
'release_date': release_date,
- }
+ }
)