mirror of
https://github.com/soimort/you-get.git
synced 2025-02-10 20:22:27 +03:00
merge
This commit is contained in:
commit
8e6ea06a96
@ -1,6 +1,14 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
0.3.11
|
||||||
|
------
|
||||||
|
|
||||||
|
*Date: 2013-04-26*
|
||||||
|
|
||||||
|
* Add support for:
|
||||||
|
- Google Drive (Google Docs)
|
||||||
|
|
||||||
0.3.10
|
0.3.10
|
||||||
------
|
------
|
||||||
|
|
||||||
|
@ -537,7 +537,8 @@ def playlist_not_supported(name):
|
|||||||
return f
|
return f
|
||||||
|
|
||||||
def print_info(site_info, title, type, size):
|
def print_info(site_info, title, type, size):
|
||||||
type = str(type).lower()
|
if type:
|
||||||
|
type = type.lower()
|
||||||
if type in ['3gp']:
|
if type in ['3gp']:
|
||||||
type = 'video/3gpp'
|
type = 'video/3gpp'
|
||||||
elif type in ['asf', 'wmv']:
|
elif type in ['asf', 'wmv']:
|
||||||
|
@ -83,10 +83,14 @@ def coursera_download(url, output_dir = '.', merge = True, info_only = False):
|
|||||||
ext = r1(r'format=(.+)', resource_url) or r1(r'\.(\w\w\w\w|\w\w\w|\w\w|\w)$', resource_url) or r1(r'download.(mp4)', resource_url)
|
ext = r1(r'format=(.+)', resource_url) or r1(r'\.(\w\w\w\w|\w\w\w|\w\w|\w)$', resource_url) or r1(r'download.(mp4)', resource_url)
|
||||||
_, _, size = url_info(resource_url)
|
_, _, size = url_info(resource_url)
|
||||||
|
|
||||||
if ext == 'mp4':
|
try:
|
||||||
download_urls([resource_url], title, ext, size, output_dir, merge = merge)
|
if ext == 'mp4':
|
||||||
else:
|
download_urls([resource_url], title, ext, size, output_dir, merge = merge)
|
||||||
download_url_chunked(resource_url, title, ext, size, output_dir, merge = merge)
|
else:
|
||||||
|
download_url_chunked(resource_url, title, ext, size, output_dir, merge = merge)
|
||||||
|
except Exception as err:
|
||||||
|
print('Skipping %s: %s\n' % (resource_url, err))
|
||||||
|
continue
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
|
|
||||||
__all__ = ['__version__', '__date__']
|
__all__ = ['__version__', '__date__']
|
||||||
|
|
||||||
__version__ = '0.3.10'
|
__version__ = '0.3.11'
|
||||||
__date__ = '2013-04-19'
|
__date__ = '2013-04-26'
|
||||||
|
Loading…
Reference in New Issue
Block a user