summary refs log tree commit diff
diff options
context:
space:
mode:
authorVarun <mailvarunest@gmail.com>2016-11-29 22:07:30 +0530
committerSergey M <dstftw@gmail.com>2016-11-29 23:37:30 +0700
commit3779d524dfd3cf72120847b235d4a3906e47a4f8 (patch)
tree67f7b2ee6f380db8d2029c328f8d42f4340ea76a
parent6303fc820417423585b681a4415b0020e0e8dd31 (diff)
downloadyoutube-dl-3779d524dfd3cf72120847b235d4a3906e47a4f8.tar.gz
youtube-dl-3779d524dfd3cf72120847b235d4a3906e47a4f8.tar.xz
youtube-dl-3779d524dfd3cf72120847b235d4a3906e47a4f8.zip
[liveleak] Add support for youtube embeds
-rw-r--r--youtube_dl/extractor/liveleak.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py
index ea0565ac0..40fef9bb6 100644
--- a/youtube_dl/extractor/liveleak.py
+++ b/youtube_dl/extractor/liveleak.py
@@ -54,6 +54,19 @@ class LiveLeakIE(InfoExtractor):
             'title': 'Crazy Hungarian tourist films close call waterspout in Croatia',
             'thumbnail': 're:^https?://.*\.jpg$'
         }
+    }, {
+        # Covers https://github.com/rg3/youtube-dl/pull/10664#issuecomment-247439521
+        'url' : 'http://m.liveleak.com/view?i=763_1473349649',
+        'add_ie': ['Youtube'],
+        'info_dict': {
+            'id': '763_1473349649',
+            'ext': 'mp4',
+            'title': 'Reporters and public officials ignore epidemic of black on asian violence in Sacramento | Colin Flaherty',
+            'description': 'Colin being the warrior he is and showing the injustice Asians in Sacramento are being subjected to.',
+            'uploader': 'Ziz',
+            'upload_date': '20160908',
+            'uploader_id': 'UCEbta5E_jqlZmEJsriTEtnw'
+        }
     }]
 
     @staticmethod
@@ -87,7 +100,7 @@ class LiveLeakIE(InfoExtractor):
             else:
                 # Maybe an embed?
                 embed_url = self._search_regex(
-                    r'<iframe[^>]+src="(http://www.prochan.com/embed\?[^"]+)"',
+                    r'<iframe[^>]+src="((?:(?:http://www.prochan.com/embed\?)|(?:http://www.youtube.com/embed))[^"]+)"',
                     webpage, 'embed URL')
                 return {
                     '_type': 'url_transparent',
@@ -107,6 +120,7 @@ class LiveLeakIE(InfoExtractor):
             'format_note': s.get('label'),
             'url': s['file'],
         } for i, s in enumerate(sources)]
+
         for i, s in enumerate(sources):
             # Removing '.h264_*.mp4' gives the raw video, which is essentially
             # the same video without the LiveLeak logo at the top (see