From c84c4dfc5236a474bf685c1acf27194c373a6ea1 Mon Sep 17 00:00:00 2001 From: Varun Verma Date: Sat, 17 Sep 2016 20:58:17 +0530 Subject: [PATCH 1/3] Added Test Case --- youtube_dl/extractor/liveleak.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index ea0565ac0..ef3b1acc5 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']+src="(http://www.prochan.com/embed\?[^"]+)"', + r']+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 From 94f67b7f61d97a029106fa2a174864021911ae2f Mon Sep 17 00:00:00 2001 From: Varun Verma Date: Sun, 25 Sep 2016 13:23:35 +0530 Subject: [PATCH 2/3] Remove unnecessary grouping from regex --- youtube_dl/extractor/liveleak.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index ef3b1acc5..87f7dc09e 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -100,7 +100,7 @@ class LiveLeakIE(InfoExtractor): else: # Maybe an embed? embed_url = self._search_regex( - r']+src="((http://www.prochan.com/embed\?)|(http://www.youtube.com/embed)[^"]+)"', + r']+src="((?:http://www.prochan.com/embed\?)|(?:http://www.youtube.com/embed)[^"]+)"', webpage, 'embed URL') return { '_type': 'url_transparent', From 3543e7adbcbeb1b2d5f5c540b0339f582f360780 Mon Sep 17 00:00:00 2001 From: Varun Verma Date: Sun, 25 Sep 2016 17:03:02 +0530 Subject: [PATCH 3/3] Fixed Regex --- youtube_dl/extractor/liveleak.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index 87f7dc09e..40fef9bb6 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -100,7 +100,7 @@ class LiveLeakIE(InfoExtractor): else: # Maybe an embed? embed_url = self._search_regex( - r']+src="((?:http://www.prochan.com/embed\?)|(?:http://www.youtube.com/embed)[^"]+)"', + r']+src="((?:(?:http://www.prochan.com/embed\?)|(?:http://www.youtube.com/embed))[^"]+)"', webpage, 'embed URL') return { '_type': 'url_transparent',