|
|
@ -104,6 +104,7 @@ from .mediasite import MediasiteIE
|
|
|
|
from .springboardplatform import SpringboardPlatformIE
|
|
|
|
from .springboardplatform import SpringboardPlatformIE
|
|
|
|
from .yapfiles import YapFilesIE
|
|
|
|
from .yapfiles import YapFilesIE
|
|
|
|
from .vice import ViceIE
|
|
|
|
from .vice import ViceIE
|
|
|
|
|
|
|
|
from .xfileshare import XFileShareIE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class GenericIE(InfoExtractor):
|
|
|
|
class GenericIE(InfoExtractor):
|
|
|
@ -2971,6 +2972,11 @@ class GenericIE(InfoExtractor):
|
|
|
|
return self.playlist_from_matches(
|
|
|
|
return self.playlist_from_matches(
|
|
|
|
vice_urls, video_id, video_title, ie=ViceIE.ie_key())
|
|
|
|
vice_urls, video_id, video_title, ie=ViceIE.ie_key())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xfileshare_urls = XFileShareIE._extract_urls(webpage)
|
|
|
|
|
|
|
|
if xfileshare_urls:
|
|
|
|
|
|
|
|
return self.playlist_from_matches(
|
|
|
|
|
|
|
|
xfileshare_urls, video_id, video_title, ie=XFileShareIE.ie_key())
|
|
|
|
|
|
|
|
|
|
|
|
def merge_dicts(dict1, dict2):
|
|
|
|
def merge_dicts(dict1, dict2):
|
|
|
|
merged = {}
|
|
|
|
merged = {}
|
|
|
|
for k, v in dict1.items():
|
|
|
|
for k, v in dict1.items():
|
|
|
|