From: Robert S. Edmonds Date: Sun, 28 Jan 2007 22:41:44 +0000 (-0500) Subject: Imported Debian patch 2007.01.19-1 X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/96b6463fbe26a4414818425b6544faf73e169ed1?hp=8f773b6fbc00c3fb1a54e98cf189dd70cfc1e746 Imported Debian patch 2007.01.19-1 --- diff --git a/debian/changelog b/debian/changelog index 7b400ce..2e2dbb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +youtube-dl (2007.01.19-1) unstable; urgency=low + + * New upstream release, closes: #406146. + + -- Robert S. Edmonds Sun, 28 Jan 2007 17:41:44 -0500 + youtube-dl (2006.12.07-1) unstable; urgency=low * New upstream release: diff --git a/debian/youtube-dl.1 b/debian/youtube-dl.1 index e294625..fb27072 100644 --- a/debian/youtube-dl.1 +++ b/debian/youtube-dl.1 @@ -1,4 +1,4 @@ -.TH YOUTUBE-DL "1" "December 2006" "youtube-dl" "User Commands" +.TH YOUTUBE-DL "1" "January 2007" "youtube-dl" "User Commands" .SH NAME youtube-dl \- download a video file from YouTube.com .SH DESCRIPTION @@ -28,3 +28,6 @@ do not download video .TP \fB\-t\fR, \fB\-\-title\fR use title in file name +.TP +\fB\-n\fR, \fB\-\-netrc\fR +use .netrc authentication data diff --git a/youtube-dl b/youtube-dl index 3cd8bfb..630eb9b 100755 --- a/youtube-dl +++ b/youtube-dl @@ -32,6 +32,9 @@ import urllib2 import re import string import os +import time +import netrc +import getpass # First off, check Python and refuse to run if sys.hexversion < 0x020400f0: @@ -48,7 +51,7 @@ const_video_url_params_re = re.compile(r'player2\.swf\?([^"]+)"', re.M) const_video_url_real_str = 'http://www.youtube.com/get_video?%s' const_video_title_re = re.compile(r'YouTube - ([^<]*)', re.M | re.I) const_1k = 1024 -const_block_size = 10 * const_1k +const_initial_block_size = 10 * const_1k # Print error message, followed by standard advice information, and then exit def error_advice_exit(error_text): @@ -69,7 +72,7 @@ def error_advice_exit(error_text): # Wrapper to create custom requests with typical headers def request_create(url, data=None): retval = urllib2.Request(url) - if not data is None: + if data is not None: retval.add_data(data) # Try to mimic Firefox, at least a little bit retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0') @@ -98,10 +101,10 @@ def cond_print(str): # Title string normalization def title_string_norm(title): + title = ''.join((x in string.ascii_letters or x in string.digits) and x or ' ' for x in title) + title = '_'.join(title.split()) title = title.lower() - title = map(lambda x: x in string.whitespace and '_' or x, title) - title = filter(lambda x: x in string.lowercase or x in string.digits or x == '_', title) - return ''.join(title) + return title # Generic download step def download_step(return_data_flag, step_title, step_error, url, post_data=None): @@ -137,9 +140,23 @@ def extract_step(step_title, step_error, regexp, data): except KeyboardInterrupt: sys.exit('\n') +# Calculate new block size based on previous block size +def new_block_size(before, after, bytes): + new_min = max(bytes / 2, 1) + new_max = max(bytes * 2, 1) + dif = after - before + if dif < 0.0001: + return new_max + rate = int(bytes / dif) + if rate > new_max: + return new_max + if rate < new_min: + return new_min + return rate + # Create the command line options parser and parse command line cmdl_usage = 'usage: %prog [options] video_url' -cmdl_version = '2006.12.07' +cmdl_version = '2007.01.19' cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve') cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit') cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit') @@ -149,6 +166,7 @@ cmdl_parser.add_option('-o', '--output', dest='outfile', metavar='FILE', help='o cmdl_parser.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode') cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video') cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name') +cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data') (cmdl_opts, cmdl_args) = cmdl_parser.parse_args() # Get video URL @@ -165,16 +183,52 @@ video_url_id = video_url_mo.group(1) video_url = const_video_url_str % video_url_id # Check conflicting options -if not cmdl_opts.outfile is None and cmdl_opts.simulate: +if cmdl_opts.outfile is not None and cmdl_opts.simulate: sys.stderr.write('Warning: video file name given but will not be used.\n') -if not cmdl_opts.outfile is None and cmdl_opts.use_title: +if cmdl_opts.outfile is not None and cmdl_opts.use_title: sys.exit('Error: using the video title conflicts with using a given file name.') -# Verify both or none present -if ((cmdl_opts.username is None and not cmdl_opts.password is None) or - (not cmdl_opts.username is None and cmdl_opts.password is None)): - sys.exit('Error: both username and password must be given, or none.') +if cmdl_opts.use_netrc and cmdl_opts.password is not None: + sys.exit('Error: using netrc conflicts with giving command line password.') + +# Incorrect option formatting +if cmdl_opts.username is None and cmdl_opts.password is not None: + sys.exit('Error: password give but username is missing.') + +# Get account information if any +account_username = None +account_password = None + +if cmdl_opts.use_netrc: + try: + info = netrc.netrc().authenticators('youtube') + if info is None: + sys.exit('Error: no authenticators for machine youtube.') + netrc_username = info[0] + netrc_password = info[2] + except IOError: + sys.exit('Error: unable to read .netrc file.') + except netrc.NetrcParseError: + sys.exit('Error: unable to parse .netrc file.') + +if cmdl_opts.password is not None: + account_username = cmdl_opts.username + account_password = cmdl_opts.password +else: + if cmdl_opts.username is not None and cmdl_opts.use_netrc: + if cmdl_opts.username != netrc_username: + sys.exit('Error: conflicting username from .netrc and command line options.') + account_username = cmdl_opts.username + account_password = netrc_password + elif cmdl_opts.username is not None: + account_username = cmdl_opts.username + account_password = getpass.getpass('Type YouTube password and press return: ') + elif cmdl_opts.use_netrc: + if len(netrc_username) == 0: + sys.exit('Error: empty username in .netrc file.') + account_username = netrc_username + account_password = netrc_password # Get output file name if cmdl_opts.outfile is None: @@ -200,9 +254,9 @@ urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler())) urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor())) # Log in and confirm age if needed -if not cmdl_opts.username is None: +if account_username is not None: url = const_login_url_str % video_url_id - post = const_login_post_str % (video_url_id, cmdl_opts.username, cmdl_opts.password) + post = const_login_post_str % (video_url_id, account_username, account_password) download_step(False, 'Logging in', 'unable to log in', url, post) url = const_age_url_str % video_url_id @@ -229,7 +283,6 @@ try: if cmdl_opts.simulate: sys.exit() - cond_print('Retrieving video data... ') video_file = open(video_filename, 'wb') try: video_len_str = '%sk' % to_k(long(video_data.info()['Content-length'])) @@ -237,12 +290,18 @@ try: video_len_str = '(unknown)' byte_counter = 0 - video_block = video_data.read(const_block_size) - while len(video_block) != 0: - byte_counter += len(video_block) - video_file.write(video_block) + block_size = const_initial_block_size + while True: cond_print('\rRetrieving video data... %sk of %s ' % (to_k(byte_counter), video_len_str)) - video_block = video_data.read(const_block_size) + before = time.time() + video_block = video_data.read(block_size) + after = time.time() + dl_bytes = len(video_block) + if dl_bytes == 0: + break + byte_counter += dl_bytes + video_file.write(video_block) + block_size = new_block_size(before, after, dl_bytes) video_file.close() cond_print('done.\n')