From 831e7138d1d2eaaf336dddff883b5c9a05aa6c4f Mon Sep 17 00:00:00 2001 From: aeph6Ee0 Date: Tue, 22 Sep 2015 00:50:15 +0200 Subject: [PATCH] [liveleak] minor fixes --- youtube_dl/extractor/liveleak.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index bb5274b1e..23bcf9437 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -167,12 +167,12 @@ class LiveLeakIE(InfoExtractor): embed_urls = list() for embed_prochan in re.findall( - r']+src="(http://www.prochan.com/embed\?[^"]+)"', + r']+src="(https?://www.prochan.com/embed\?[^"]+)"', webpage): embed_urls.append(embed_prochan) for embed_youtube in re.findall( - r']+src="(http[s]?://www.youtube.com/embed/[^"]+)"', + r']+src="(https?://www.youtube.com/embed/[^"]+)"', webpage): embed_urls.append(embed_youtube) @@ -187,12 +187,9 @@ class LiveLeakIE(InfoExtractor): 'age_limit': age_limit, }) - if len(entries) == 1: - return entries[0] - else: - return { - '_type': 'multi_video', - 'id': page_id, - 'title': 'Fuel Depot in China Explosion caught on video', - 'entries': entries, - } + return { + '_type': 'multi_video', + 'id': page_id, + 'title': video_title, + 'entries': entries, + }