summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-11-29 23:42:19 +0700
committerSergey M․ <dstftw@gmail.com>2016-11-29 23:42:19 +0700
commit8b0d3ee64ee20de35d0828b01ece98f59bb19e1d (patch)
treeb1d19917bbd20daa5c83666f4e9f2ee82e2c039a
parent3779d524dfd3cf72120847b235d4a3906e47a4f8 (diff)
downloadyoutube-dl-8b0d3ee64ee20de35d0828b01ece98f59bb19e1d.tar.gz
youtube-dl-8b0d3ee64ee20de35d0828b01ece98f59bb19e1d.tar.xz
youtube-dl-8b0d3ee64ee20de35d0828b01ece98f59bb19e1d.zip
[liveleak] Simplify and PEP 8
-rw-r--r--youtube_dl/extractor/liveleak.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py
index 40fef9bb6..b84e4dd6c 100644
--- a/youtube_dl/extractor/liveleak.py
+++ b/youtube_dl/extractor/liveleak.py
@@ -56,7 +56,7 @@ class LiveLeakIE(InfoExtractor):
         }
     }, {
         # Covers https://github.com/rg3/youtube-dl/pull/10664#issuecomment-247439521
-        'url' : 'http://m.liveleak.com/view?i=763_1473349649',
+        'url': 'http://m.liveleak.com/view?i=763_1473349649',
         'add_ie': ['Youtube'],
         'info_dict': {
             'id': '763_1473349649',
@@ -66,7 +66,10 @@ class LiveLeakIE(InfoExtractor):
             'uploader': 'Ziz',
             'upload_date': '20160908',
             'uploader_id': 'UCEbta5E_jqlZmEJsriTEtnw'
-        }
+        },
+        'params': {
+            'skip_download': True,
+        },
     }]
 
     @staticmethod
@@ -100,7 +103,7 @@ class LiveLeakIE(InfoExtractor):
             else:
                 # Maybe an embed?
                 embed_url = self._search_regex(
-                    r'<iframe[^>]+src="((?:(?:http://www.prochan.com/embed\?)|(?:http://www.youtube.com/embed))[^"]+)"',
+                    r'<iframe[^>]+src="(https?://(?:www\.)?(?:prochan|youtube)\.com/embed[^"]+)"',
                     webpage, 'embed URL')
                 return {
                     '_type': 'url_transparent',