aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-03-03 01:24:36 +0700
committerSergey M․ <dstftw@gmail.com>2018-03-03 01:24:36 +0700
commit4c780fbd0ab1938a0fa98af6a66cfe5f08c3cda7 (patch)
tree4becfb8e971a4df74fe954f7d871d0cfab1fbe70 /youtube_dl/extractor/generic.py
parent7773a92800900413af0846a3da580749483be346 (diff)
[yapfiles] Add extractor (closes #15726, refs #11085)
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index b66e623f8..bc350bcf7 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -102,6 +102,7 @@ from .channel9 import Channel9IE
from .vshare import VShareIE
from .mediasite import MediasiteIE
from .springboardplatform import SpringboardPlatformIE
+from .yapfiles import YapFilesIE
class GenericIE(InfoExtractor):
@@ -1970,6 +1971,18 @@ class GenericIE(InfoExtractor):
'params': {
'skip_download': True,
},
+ },
+ {
+ 'url': 'https://www.yapfiles.ru/show/1872528/690b05d3054d2dbe1e69523aa21bb3b1.mp4.html',
+ 'info_dict': {
+ 'id': 'vMDE4NzI1Mjgt690b',
+ 'ext': 'mp4',
+ 'title': 'Котята',
+ },
+ 'add_ie': [YapFilesIE.ie_key()],
+ 'params': {
+ 'skip_download': True,
+ },
}
# {
# # TODO: find another test
@@ -2947,6 +2960,11 @@ class GenericIE(InfoExtractor):
springboardplatform_urls, video_id, video_title,
ie=SpringboardPlatformIE.ie_key())
+ yapfiles_urls = YapFilesIE._extract_urls(webpage)
+ if yapfiles_urls:
+ return self.playlist_from_matches(
+ yapfiles_urls, video_id, video_title, ie=YapFilesIE.ie_key())
+
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():