projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
29cfcb4
)
[extractor/common] improve jwplayer relative url handling(closes #18892)
author
Remita Amine
<remitamine@gmail.com>
Sun, 20 Jan 2019 12:31:41 +0000
(13:31 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Sun, 20 Jan 2019 12:31:52 +0000
(13:31 +0100)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 6e36e677843ddedc949a2a74de492622309347ed..95456b291b116e8a14b0d5d945a5bd33fd4a566c 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-2630,7
+2630,7
@@
class InfoExtractor(object):
'id': this_video_id,
'title': unescapeHTML(video_data['title'] if require_title else video_data.get('title')),
'description': video_data.get('description'),
'id': this_video_id,
'title': unescapeHTML(video_data['title'] if require_title else video_data.get('title')),
'description': video_data.get('description'),
- 'thumbnail':
self._proto_relative_url(video_data.get('image'
)),
+ 'thumbnail':
urljoin(base_url, self._proto_relative_url(video_data.get('image')
)),
'timestamp': int_or_none(video_data.get('pubdate')),
'duration': float_or_none(jwplayer_data.get('duration') or video_data.get('duration')),
'subtitles': subtitles,
'timestamp': int_or_none(video_data.get('pubdate')),
'duration': float_or_none(jwplayer_data.get('duration') or video_data.get('duration')),
'subtitles': subtitles,
@@
-2657,12
+2657,9
@@
class InfoExtractor(object):
for source in jwplayer_sources_data:
if not isinstance(source, dict):
continue
for source in jwplayer_sources_data:
if not isinstance(source, dict):
continue
- source_url = self._proto_relative_url(source.get('file'))
- if not source_url:
- continue
- if base_url:
- source_url = compat_urlparse.urljoin(base_url, source_url)
- if source_url in urls:
+ source_url = urljoin(
+ base_url, self._proto_relative_url(source.get('file')))
+ if not source_url or source_url in urls:
continue
urls.append(source_url)
source_type = source.get('type') or ''
continue
urls.append(source_url)
source_type = source.get('type') or ''