projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[tvplayhome] Fix episode metadata extraction (closes #19190)
[youtube-dl]
/
youtube_dl
/
extractor
/
zdf.py
diff --git
a/youtube_dl/extractor/zdf.py
b/youtube_dl/extractor/zdf.py
index bb9020c918b3659437d752c5a4109bc520e3ab88..afa3f6c47f17a52f40903751cad5ff4293411715 100644
(file)
--- a/
youtube_dl/extractor/zdf.py
+++ b/
youtube_dl/extractor/zdf.py
@@
-15,6
+15,7
@@
from ..utils import (
try_get,
unified_timestamp,
update_url_query,
try_get,
unified_timestamp,
update_url_query,
+ url_or_none,
urljoin,
)
urljoin,
)
@@
-67,8
+68,8
@@
class ZDFIE(ZDFBaseIE):
def _extract_subtitles(src):
subtitles = {}
for caption in try_get(src, lambda x: x['captions'], list) or []:
def _extract_subtitles(src):
subtitles = {}
for caption in try_get(src, lambda x: x['captions'], list) or []:
- subtitle_url =
caption.get('uri'
)
- if subtitle_url
and isinstance(subtitle_url, compat_str)
:
+ subtitle_url =
url_or_none(caption.get('uri')
)
+ if subtitle_url:
lang = caption.get('language', 'deu')
subtitles.setdefault(lang, []).append({
'url': subtitle_url,
lang = caption.get('language', 'deu')
subtitles.setdefault(lang, []).append({
'url': subtitle_url,
@@
-76,8
+77,8
@@
class ZDFIE(ZDFBaseIE):
return subtitles
def _extract_format(self, video_id, formats, format_urls, meta):
return subtitles
def _extract_format(self, video_id, formats, format_urls, meta):
- format_url =
meta.get('url'
)
- if not format_url
or not isinstance(format_url, compat_str)
:
+ format_url =
url_or_none(meta.get('url')
)
+ if not format_url:
return
if format_url in format_urls:
return
return
if format_url in format_urls:
return
@@
-152,7
+153,8
@@
class ZDFIE(ZDFBaseIE):
content, lambda x: x['teaserImageRef']['layouts'], dict)
if layouts:
for layout_key, layout_url in layouts.items():
content, lambda x: x['teaserImageRef']['layouts'], dict)
if layouts:
for layout_key, layout_url in layouts.items():
- if not isinstance(layout_url, compat_str):
+ layout_url = url_or_none(layout_url)
+ if not layout_url:
continue
thumbnail = {
'url': layout_url,
continue
thumbnail = {
'url': layout_url,