[instagram] Merge branch 'alexfalcucc-develop' into develop

This commit is contained in:
Mort Yao 2015-10-29 13:09:03 +01:00
commit 42ed56d2fd

View File

@ -20,8 +20,9 @@ def instagram_download(url, output_dir='.', merge=True, info_only=False, **kwarg
_, _, size = url_info(image) _, _, size = url_info(image)
print_info(site_info, title, ext, size) print_info(site_info, title, ext, size)
url = stream if stream else image
if not info_only: if not info_only:
download_urls([image], title, ext, size, output_dir, merge=merge) download_urls([url], title, ext, size, output_dir, merge=merge)
site_info = "Instagram.com" site_info = "Instagram.com"
download = instagram_download download = instagram_download