schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[vice] Fix extraction and rework extractors (closes #11101, closes #13019, closes #13622, closes #13778)

Browse source
This commit is contained in:
Sergey M․ 2018-03-03 23:07:29 +07:00
parent c01db237b5
commit 86c8cfc555
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
4 changed files with 182 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/extractor/generic.py
View file

@ -103,6 +103,7 @@ from .vshare import VShareIE
from .mediasite import MediasiteIE
from .springboardplatform import SpringboardPlatformIE
from .yapfiles import YapFilesIE
from .vice import ViceIE
class GenericIE(InfoExtractor):
@ -2965,6 +2966,11 @@ class GenericIE(InfoExtractor):
return self.playlist_from_matches(
yapfiles_urls, video_id, video_title, ie=YapFilesIE.ie_key())
vice_urls = ViceIE._extract_urls(webpage)
if vice_urls:
return self.playlist_from_matches(
vice_urls, video_id, video_title, ie=ViceIE.ie_key())
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():