diff options
author | Timendum <[email protected]> | 2017-11-14 16:34:45 +0100 |
---|---|---|
committer | Sergey M <[email protected]> | 2017-11-14 22:34:45 +0700 |
commit | 0987f2ddb27a27506c697ad9dae2ccbf24fc786d (patch) | |
tree | 9fa7814f0935baabce5740dcc8be83aeadf5b323 /youtube_dl/extractor/generic.py | |
parent | 5871ebac473e723376722a37baecf51d6ae7d781 (diff) | |
download | youtube-dl-0987f2ddb27a27506c697ad9dae2ccbf24fc786d.tar.gz youtube-dl-0987f2ddb27a27506c697ad9dae2ccbf24fc786d.zip |
[vshare] Fix extraction (closes #14473)
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r-- | youtube_dl/extractor/generic.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 2a9c3e2de..31564e550 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -102,6 +102,7 @@ from .joj import JojIE from .megaphone import MegaphoneIE from .vzaar import VzaarIE from .channel9 import Channel9IE +from .vshare import VShareIE class GenericIE(InfoExtractor): @@ -1921,6 +1922,16 @@ class GenericIE(InfoExtractor): 'title': 'Rescue Kit 14 Free Edition - Getting started', }, 'playlist_count': 4, + }, + { + # vshare embed + 'url': 'https://youtube-dl-demo.neocities.org/vshare.html', + 'md5': '17b39f55b5497ae8b59f5fbce8e35886', + 'info_dict': { + 'id': '0f64ce6', + 'title': 'vl14062007715967', + 'ext': 'mp4', + } } # { # # TODO: find another test @@ -2879,6 +2890,11 @@ class GenericIE(InfoExtractor): return self.playlist_from_matches( channel9_urls, video_id, video_title, ie=Channel9IE.ie_key()) + vshare_urls = VShareIE._extract_urls(webpage) + if vshare_urls: + return self.playlist_from_matches( + vshare_urls, video_id, video_title, ie=VShareIE.ie_key()) + def merge_dicts(dict1, dict2): merged = {} for k, v in dict1.items(): |