From 15a95f544a1a15e3b11d741284f9ecbd6640151e Mon Sep 17 00:00:00 2001 From: Varun Verma Date: Thu, 15 Sep 2016 22:17:10 +0530 Subject: [PATCH 1/3] Support youtube embed url in liveleak post Example Post Link : http://m.liveleak.com/view?i=763_1473349649 --- youtube_dl/extractor/liveleak.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index ea0565ac0..b9e6baeff 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -87,7 +87,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 +107,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 93d430baa4a8844bf3a5b88269d3949ea64fa6ca Mon Sep 17 00:00:00 2001 From: Varun Verma Date: Fri, 16 Sep 2016 01:15:47 +0530 Subject: [PATCH 2/3] Update Regex to support new line in player data script for IMDB IE --- youtube_dl/extractor/imdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/imdb.py b/youtube_dl/extractor/imdb.py index f0fc8d49a..e6c3e2d1a 100644 --- a/youtube_dl/extractor/imdb.py +++ b/youtube_dl/extractor/imdb.py @@ -56,7 +56,7 @@ class ImdbIE(InfoExtractor): formats = [] for format_page in format_pages: json_data = self._search_regex( - r']+class="imdb-player-data"[^>]*?>(.*?)', + r'(?s)]+class="imdb-player-data"[^>]*?>(.*?)', format_page, 'json data', flags=re.DOTALL) info = self._parse_json(json_data, video_id, fatal=False) if not info: From 232165777d7da29ada6405b5e398fc24af30458d Mon Sep 17 00:00:00 2001 From: Varun Verma Date: Sat, 17 Sep 2016 20:54:54 +0530 Subject: [PATCH 3/3] Add Test Case in LiveLeak IE Extractor --- youtube_dl/extractor/liveleak.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index b9e6baeff..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