]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[motherless] Fix extraction (closes #16786)
authorSergey M․ <dstftw@gmail.com>
Thu, 21 Jun 2018 16:38:32 +0000 (23:38 +0700)
committerSergey M․ <dstftw@gmail.com>
Thu, 21 Jun 2018 16:38:32 +0000 (23:38 +0700)
youtube_dl/extractor/motherless.py

index e24396e791cfddf88e53a34639e563b54795694e..f191310e176048921dc8d875bf6f32d1147e4903 100644 (file)
@@ -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+([^<]+)<',