From ac7ea5c4c8080f89309f6347bb23774889063367 Mon Sep 17 00:00:00 2001 From: aeph6Ee0 Date: Tue, 15 Sep 2015 15:37:52 +0200 Subject: [PATCH] [liveleak] add extractor for embedded youtube videos --- youtube_dl/extractor/liveleak.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index 6315ae4ed..68b37646b 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -148,12 +148,16 @@ class LiveLeakIE(InfoExtractor): embed_urls = list() # prochan.com: - embed_prochan = (re.findall( - r']+src="(http://www.prochan.com/embed\?[^"]+)"', - webpage)) - if len(embed_prochan) > 0: - for embed in embed_prochan: - embed_urls.append(embed) + for embed_prochan in re.findall( + r']+src="(http://www.prochan.com/embed\?[^"]+)"', + webpage): + embed_urls.append(embed_prochan) + + # youtube.com: + for embed_youtube in re.findall( + r']+src="(http[s]?://www.youtube.com/embed/[^"]+)"', + webpage): + embed_urls.append(embed_youtube) # add all collected embed urls to list for embed_url in embed_urls: @@ -167,6 +171,7 @@ class LiveLeakIE(InfoExtractor): 'age_limit': age_limit, }) + if len(entries) == 1: return entries[0] else: