R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[liveleak] minor fixes

Browse Source
This commit is contained in:
aeph6Ee0 2015-09-22 00:50:15 +02:00
parent 1f52830eaf
commit 831e7138d1
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/liveleak.py
View File

@ -167,12 +167,12 @@ class LiveLeakIE(InfoExtractor):
embed_urls = list() embed_urls = list()
for embed_prochan in re.findall( for embed_prochan in re.findall(
r'<iframe[^>]+src="(http://www.prochan.com/embed\?[^"]+)"', r'<iframe[^>]+src="(https?://www.prochan.com/embed\?[^"]+)"',
webpage): webpage):
embed_urls.append(embed_prochan) embed_urls.append(embed_prochan)
for embed_youtube in re.findall( for embed_youtube in re.findall(
r'<iframe[^>]+src="(http[s]?://www.youtube.com/embed/[^"]+)"', r'<iframe[^>]+src="(https?://www.youtube.com/embed/[^"]+)"',
webpage): webpage):
embed_urls.append(embed_youtube) embed_urls.append(embed_youtube)
@ -187,12 +187,9 @@ class LiveLeakIE(InfoExtractor):
'age_limit': age_limit, 'age_limit': age_limit,
}) })
if len(entries) == 1: return {
return entries[0] '_type': 'multi_video',
else: 'id': page_id,
return { 'title': video_title,
'_type': 'multi_video', 'entries': entries,
'id': page_id, }
'title': 'Fuel Depot in China Explosion caught on video',
'entries': entries,
}