From 5eb95a8d279f2669b8f725b8993a584b8e19a807 Mon Sep 17 00:00:00 2001 From: Le bang Date: Mon, 11 Nov 2013 11:57:17 +0700 Subject: [PATCH 1/4] Add Dynamic feature Quickly for GUI --- youtube_dl/FileDownloader.py | 4 ++++ youtube_dl/__init__.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 088f59586..c69006128 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -544,6 +544,10 @@ class FileDownloader(object): # Download and write before = time.time() data_block = data.read(block_size) + # Dynamic output video binary to stdout + if self.params.get('dynamic', False) and self.params.get('quiet', False): + sys.stdout.write(data_block) + after = time.time() if len(data_block) == 0: break diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index ab7879c5d..cc3676daf 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -279,7 +279,9 @@ def parseOpts(overrideArguments=None): 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) downloader.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP) - + + verbosity.add_option('-d', '--dynamic', + action='store_true', dest='dynamic', help='Dynamic ouput video binary to stdout', default=False) verbosity.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode', default=False) verbosity.add_option('-s', '--simulate', @@ -607,6 +609,7 @@ def _real_main(argv=None): 'username': opts.username, 'password': opts.password, 'videopassword': opts.videopassword, + 'dynamic': opts.dynamic, 'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat), 'forceurl': opts.geturl, 'forcetitle': opts.gettitle, From 1ba765ef269eb5db12104fdc57c4ca377b9f7261 Mon Sep 17 00:00:00 2001 From: Le bang Date: Mon, 11 Nov 2013 13:02:45 +0700 Subject: [PATCH 2/4] Update FileDownloader.py --- youtube_dl/FileDownloader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index c69006128..420dc0481 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -546,7 +546,10 @@ class FileDownloader(object): data_block = data.read(block_size) # Dynamic output video binary to stdout if self.params.get('dynamic', False) and self.params.get('quiet', False): - sys.stdout.write(data_block) + try: + sys.stdout.write(data_block) + except ImportError: # Python 3 + sys.stdout.buffer.write(data_block) after = time.time() if len(data_block) == 0: From 070a9c18419adfc3dab91f91c32f75b660135fcd Mon Sep 17 00:00:00 2001 From: Le bang Date: Mon, 11 Nov 2013 15:57:25 +0700 Subject: [PATCH 3/4] Add Dynamic feature --- youtube_dl/FileDownloader.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 420dc0481..176a9fde0 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -550,7 +550,6 @@ class FileDownloader(object): sys.stdout.write(data_block) except ImportError: # Python 3 sys.stdout.buffer.write(data_block) - after = time.time() if len(data_block) == 0: break From f9cb1f9ab590adf21941840652622e501accd9cc Mon Sep 17 00:00:00 2001 From: Le bang Date: Mon, 11 Nov 2013 19:50:55 +0700 Subject: [PATCH 4/4] Test Travis CI --- youtube_dl/FileDownloader.py | 7 +------ youtube_dl/__init__.py | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 176a9fde0..15ea75468 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -544,12 +544,7 @@ class FileDownloader(object): # Download and write before = time.time() data_block = data.read(block_size) - # Dynamic output video binary to stdout - if self.params.get('dynamic', False) and self.params.get('quiet', False): - try: - sys.stdout.write(data_block) - except ImportError: # Python 3 - sys.stdout.buffer.write(data_block) + after = time.time() if len(data_block) == 0: break diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index cc3676daf..fb7e21afd 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -280,8 +280,6 @@ def parseOpts(overrideArguments=None): help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False) downloader.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP) - verbosity.add_option('-d', '--dynamic', - action='store_true', dest='dynamic', help='Dynamic ouput video binary to stdout', default=False) verbosity.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode', default=False) verbosity.add_option('-s', '--simulate', @@ -609,7 +607,6 @@ def _real_main(argv=None): 'username': opts.username, 'password': opts.password, 'videopassword': opts.videopassword, - 'dynamic': opts.dynamic, 'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat), 'forceurl': opts.geturl, 'forcetitle': opts.gettitle,