mirror of
https://github.com/soimort/you-get.git
synced 2025-01-24 22:15:03 +03:00
[dailymotion] use ffmpeg_download_stream, fix #1466
This commit is contained in:
parent
feffcb656a
commit
4b55884e86
@ -4,6 +4,11 @@ __all__ = ['dailymotion_download']
|
||||
|
||||
from ..common import *
|
||||
|
||||
def extract_m3u(url):
|
||||
content = get_content(url)
|
||||
m3u_url = re.findall(r'http://.*', content)[0]
|
||||
return match1(m3u_url, r'([^#]+)')
|
||||
|
||||
def dailymotion_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
|
||||
"""Downloads Dailymotion videos by URL.
|
||||
"""
|
||||
@ -13,7 +18,7 @@ def dailymotion_download(url, output_dir = '.', merge = True, info_only = False,
|
||||
title = match1(html, r'"video_title"\s*:\s*"([^"]+)"') or \
|
||||
match1(html, r'"title"\s*:\s*"([^"]+)"')
|
||||
|
||||
for quality in ['720','480','380','240','auto']:
|
||||
for quality in ['1080','720','480','380','240','auto']:
|
||||
try:
|
||||
real_url = info[quality][0]["url"]
|
||||
if real_url:
|
||||
@ -21,11 +26,12 @@ def dailymotion_download(url, output_dir = '.', merge = True, info_only = False,
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
type, ext, size = url_info(real_url)
|
||||
m3u_url = extract_m3u(real_url)
|
||||
mime, ext, size = 'video/mp4', 'mp4', 0
|
||||
|
||||
print_info(site_info, title, type, size)
|
||||
print_info(site_info, title, mime, size)
|
||||
if not info_only:
|
||||
download_urls([real_url], title, ext, size, output_dir, merge = merge)
|
||||
download_url_ffmpeg(m3u_url, title, ext, output_dir=output_dir, merge=merge)
|
||||
|
||||
site_info = "Dailymotion.com"
|
||||
download = dailymotion_download
|
||||
|
Loading…
Reference in New Issue
Block a user