From f2ad10a97d59a7abf994facdd2180a356fdd701f Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Sun, 26 Aug 2012 09:11:19 +0200 Subject: Add arte.tv Info Extractor --- youtube_dl/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 86951840d..13cf77896 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -351,6 +351,7 @@ def gen_extractors(): MixcloudIE(), StanfordOpenClassroomIE(), MTVIE(), + ArteTvIE(), GenericIE() ] -- cgit v1.2.3 From cc872b68a895bae05bd266cc59d53f6e3c638f6c Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 16:42:50 +0100 Subject: Actually merge #379 --- youtube_dl/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 5fc39184a..92478aa6b 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -187,6 +187,11 @@ def parseOpts(): dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)') general.add_option('-R', '--retries', dest='retries', metavar='RETRIES', help='number of retries (default is %default)', default=10) + general.add_option('--buffer-size', + dest='buffersize', metavar='SIZE', help='size of download buffer (e.g. 1024 or 16k) (default is %default)', default="1024") + general.add_option('--no-resize-buffer', + action='store_true', dest='noresizebuffer', + help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False) general.add_option('--dump-user-agent', action='store_true', dest='dump_user_agent', help='display the current browser identification', default=False) @@ -443,6 +448,11 @@ def _real_main(): opts.retries = long(opts.retries) except (TypeError, ValueError), err: parser.error(u'invalid retry count specified') + if opts.buffersize is not None: + numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize) + if numeric_buffersize is None: + parser.error(u'invalid buffer size specified') + opts.buffersize = numeric_buffersize try: opts.playliststart = int(opts.playliststart) if opts.playliststart <= 0: @@ -493,6 +503,8 @@ def _real_main(): 'ratelimit': opts.ratelimit, 'nooverwrites': opts.nooverwrites, 'retries': opts.retries, + 'buffersize': opts.buffersize, + 'noresizebuffer': opts.noresizebuffer, 'continuedl': opts.continue_dl, 'noprogress': opts.noprogress, 'playliststart': opts.playliststart, -- cgit v1.2.3 From 26396311b557696491152fd002f6d55e8126228b Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 17:16:49 +0100 Subject: Add Christian Albrecht (Arte.tv IE) to authors --- youtube_dl/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index f7a49e13a..d940b92e4 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -18,6 +18,7 @@ __authors__ = ( 'Ori Avtalion', 'shizeeg', 'Filippo Valsorda', + 'Christian Albrecht', ) __license__ = 'Public Domain' -- cgit v1.2.3 From f8d8b39bba9bc8b140f8471c2698bdf31ac4bb5d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 18:30:34 +0100 Subject: Prepare 2012.11.29 release --- youtube_dl/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index d940b92e4..75ae7e838 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -22,7 +22,7 @@ __authors__ = ( ) __license__ = 'Public Domain' -__version__ = '2012.11.28' +__version__ = '2012.11.29' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION' -- cgit v1.2.3 From 3aeb78ea4e5808e30a4f9b7d8496473ad842d7ac Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 19:03:37 +0100 Subject: Better formatting (PEP 8) --- youtube_dl/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 75ae7e838..4fed20d54 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -127,9 +127,12 @@ def parseOpts(): opts = [] - if option._short_opts: opts.append(option._short_opts[0]) - if option._long_opts: opts.append(option._long_opts[0]) - if len(opts) > 1: opts.insert(1, ', ') + if option._short_opts: + opts.append(option._short_opts[0]) + if option._long_opts: + opts.append(option._long_opts[0]) + if len(opts) > 1: + opts.insert(1, ', ') if option.takes_value(): opts.append(' %s' % option.metavar) -- cgit v1.2.3 From 95649b3936e10a48c4a5009eecfb7647756bde39 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 19:05:03 +0100 Subject: Replace long with int (see PEP 237) --- youtube_dl/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl/__init__.py') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 4fed20d54..54c7d7f72 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -449,7 +449,7 @@ def _real_main(): opts.ratelimit = numeric_limit if opts.retries is not None: try: - opts.retries = long(opts.retries) + opts.retries = int(opts.retries) except (TypeError, ValueError), err: parser.error(u'invalid retry count specified') if opts.buffersize is not None: -- cgit v1.2.3