aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-08-24 23:12:53 +0700
committerSergey M․ <dstftw@gmail.com>2018-08-24 23:12:53 +0700
commite0b6e988710037791057cd0b65f795d44e2f534c (patch)
tree2a316a2e5dae271160a6c53a81d9820e1b8b7a59
parentbeff09505cc4a7a980901c6e48adc1620aa417aa (diff)
downloadyoutube-dl-e0b6e988710037791057cd0b65f795d44e2f534c.tar.xz
[generic] Allow relative src for videojs embeds (closes #17324)
-rw-r--r--youtube_dl/extractor/generic.py19
1 files changed, 17 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 83a31f3d3..096348513 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -2071,6 +2071,21 @@ class GenericIE(InfoExtractor):
},
'playlist_count': 6,
},
+ {
+ # videojs embed
+ 'url': 'https://video.sibnet.ru/shell.php?videoid=3422904',
+ 'info_dict': {
+ 'id': 'shell',
+ 'ext': 'mp4',
+ 'title': 'Доставщик пиццы спросил разрешения сыграть на фортепиано',
+ 'description': 'md5:89209cdc587dab1e4a090453dbaa2cb1',
+ 'thumbnail': r're:^https?://.*\.jpg$',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ 'expected_warnings': ['Failed to download MPD manifest'],
+ },
# {
# # TODO: find another test
# # http://schema.org/VideoObject
@@ -3152,8 +3167,8 @@ class GenericIE(InfoExtractor):
sources = [sources]
formats = []
for source in sources:
- src = url_or_none(source.get('src'))
- if not src:
+ src = source.get('src')
+ if not src or not isinstance(src, compat_str):
continue
src = compat_urlparse.urljoin(url, src)
src_type = source.get('type')