From 26e274666d285026dfb6033cdad74cc2a108e2bc Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 23 Jan 2015 17:22:14 +0100 Subject: [PATCH] [liveleak] Add original videos (Fixes #4768) --- youtube_dl/extractor/liveleak.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index e56a4d6b1..35822067f 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -11,17 +11,17 @@ class LiveLeakIE(InfoExtractor): _VALID_URL = r'https?://(?:\w+\.)?liveleak\.com/view\?(?:.*?)i=(?P[\w_]+)(?:.*)' _TESTS = [{ 'url': 'http://www.liveleak.com/view?i=757_1364311680', - 'md5': '0813c2430bea7a46bf13acf3406992f4', + 'md5': '50f79e05ba149149c1b4ea961223d5b3', 'info_dict': { 'id': '757_1364311680', - 'ext': 'mp4', + 'ext': 'flv', 'description': 'extremely bad day for this guy..!', 'uploader': 'ljfriel2', 'title': 'Most unlucky car accident' } }, { 'url': 'http://www.liveleak.com/view?i=f93_1390833151', - 'md5': 'd3f1367d14cc3c15bf24fbfbe04b9abf', + 'md5': 'b13a29626183c9d33944e6a04f41aafc', 'info_dict': { 'id': 'f93_1390833151', 'ext': 'mp4', @@ -80,9 +80,19 @@ class LiveLeakIE(InfoExtractor): sources = json.loads(sources_json) formats = [{ + 'format_id': '%s' % i, 'format_note': s.get('label'), 'url': s['file'], - } for s in sources] + } for i, s in enumerate(sources)] + for i, s in enumerate(sources): + orig_url = s['file'].replace('.h264_base.mp4', '') + if s['file'] != orig_url: + formats.append({ + 'format_id': 'original-%s' % i, + 'format_note': s.get('label'), + 'url': orig_url, + 'preference': 1, + }) self._sort_formats(formats) return { -- 2.22.2