aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-06-21 23:38:32 +0700
committerSergey M․ <dstftw@gmail.com>2018-06-21 23:38:32 +0700
commitb71cc719103c45365244334a4c481f88cd3534fc (patch)
treeae8ae1f92e093256e75a26af371312914112d6e3 /youtube_dl/extractor
parenta4ec45179e554e9b24e32c3c06908804b42a5a9c (diff)
[motherless] Fix extraction (closes #16786)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/motherless.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/motherless.py b/youtube_dl/extractor/motherless.py
index e24396e79..f191310e1 100644
--- a/youtube_dl/extractor/motherless.py
+++ b/youtube_dl/extractor/motherless.py
@@ -77,8 +77,11 @@ class MotherlessIE(InfoExtractor):
title = self._html_search_regex(
r'id="view-upload-title">\s+([^<]+)<', webpage, 'title')
- video_url = self._html_search_regex(
- r'setup\(\{\s+"file".+: "([^"]+)",', webpage, 'video URL')
+ video_url = (self._html_search_regex(
+ (r'setup\(\{\s*["\']file["\']\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1',
+ r'fileurl\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1'),
+ webpage, 'video URL', default=None, group='url') or
+ 'http://cdn4.videos.motherlessmedia.com/videos/%s.mp4?fs=opencloud' % video_id)
age_limit = self._rta_search(webpage)
view_count = str_to_int(self._html_search_regex(
r'<strong>Views</strong>\s+([^<]+)<',