From: Robert S. Edmonds Date: Wed, 12 Mar 2008 18:26:04 +0000 (-0400) Subject: Imported Debian patch 2008.03.08-1 X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/0b091d41691aa7a6c2d72f1b7a284fd78d76cd30?ds=sidebyside;hp=-c Imported Debian patch 2008.03.08-1 --- 0b091d41691aa7a6c2d72f1b7a284fd78d76cd30 diff --combined debian/changelog index 427163b,0000000..61a7caa mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,83 -1,0 +1,90 @@@ ++youtube-dl (2008.03.08-1) unstable; urgency=low ++ ++ * New upstream release: ++ - adds -b / --best-quality command line option. ++ ++ -- Robert S. Edmonds Wed, 12 Mar 2008 14:26:04 -0400 ++ +youtube-dl (2008.01.24-1) unstable; urgency=low + + * New upstream release; closes: #462427, #462428. + - fixes youtube download issues. + + -- Robert S. Edmonds Thu, 24 Jan 2008 22:15:05 -0500 + +youtube-dl (2007.10.09-1) unstable; urgency=low + + * New upstream release. + + -- Robert S. Edmonds Mon, 08 Oct 2007 19:22:33 -0400 + +youtube-dl (2007.08.24-1) unstable; urgency=low + + * New upstream release; closes: #439363. + + -- Robert S. Edmonds Fri, 24 Aug 2007 13:54:40 -0400 + +youtube-dl (2007.06.22-1) unstable; urgency=low + + * New upstream release: + - regex update. + + -- Robert S. Edmonds Thu, 21 Jun 2007 20:42:57 -0400 + +youtube-dl (2007.06.06-1) unstable; urgency=low + + * New upstream release: + - "--title-too" command line option to print the video's title. + + -- Robert S. Edmonds Thu, 07 Jun 2007 01:04:01 -0400 + +youtube-dl (2007.03.27-1) unstable; urgency=low + + * New upstream release: + - Progress meter. + - "--literal" command line option to use the video title in the filename. + - "--get-url" command line option to print the real video URL. + + -- Robert S. Edmonds Mon, 2 Apr 2007 21:46:56 -0400 + +youtube-dl (2007.02.18-1) unstable; urgency=low + + * New upstream release: + - Diction. + - Catches socket errors. + + -- Robert S. Edmonds Tue, 20 Feb 2007 13:57:32 -0500 + +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: + - Use -t to name the downloaded file after the title, closes: #395184. + - Parses URLs without a leading "http://", closes: #400321. + + -- Robert S. Edmonds Sun, 10 Dec 2006 13:52:36 -0500 + +youtube-dl (2006.11.12-1) unstable; urgency=low + + * New upstream release. + + -- Robert S. Edmonds Sat, 25 Nov 2006 16:12:03 -0500 + +youtube-dl (2006.09.25-1) unstable; urgency=low + + * New upstream release. + * python >= 2.4 is now required. + + -- Robert S. Edmonds Wed, 27 Sep 2006 17:43:07 -0400 + +youtube-dl (2006.08.28-1) unstable; urgency=low + + * Initial release, closes: #385748. + + -- Robert S. Edmonds Sun, 3 Sep 2006 19:43:27 -0400 + diff --combined debian/youtube-dl.1 index 589bd7b,0000000..864123f mode 100644,000000..100644 --- a/debian/youtube-dl.1 +++ b/debian/youtube-dl.1 @@@ -1,42 -1,0 +1,44 @@@ - .TH YOUTUBE-DL "1" "June 2007" "youtube-dl" "User Commands" ++.TH YOUTUBE-DL "1" "March 2008" "youtube-dl" "User Commands" +.SH NAME +youtube-dl \- download a video file from YouTube.com +.SH DESCRIPTION +usage: youtube\-dl [options] video_url +.SS "options:" +.TP +\fB\-h\fR, \fB\-\-help\fR +print this help text and exit +.TP +\fB\-v\fR, \fB\-\-version\fR +print program version and exit +.TP +\fB\-u\fR USERNAME, \fB\-\-username\fR=\fIUSERNAME\fR +account username +.TP +\fB\-p\fR PASSWORD, \fB\-\-password\fR=\fIPASSWORD\fR +account password +.TP +\fB\-o\fR FILE, \fB\-\-output\fR=\fIFILE\fR +output video file name +.TP +\fB\-q\fR, \fB\-\-quiet\fR +activates quiet mode +.TP +\fB\-s\fR, \fB\-\-simulate\fR +do not download video +.TP +\fB\-t\fR, \fB\-\-title\fR +use title in file name +.TP +\fB\-l\fR, \fB\-\-literal\fR +use literal title in file name +.TP +\fB\-n\fR, \fB\-\-netrc\fR +use .netrc authentication data +.TP +\fB\-g\fR, \fB\-\-get-url\fR +print final video URL only +.TP +\fB\-2\fR, \fB\-\-title-too\fR +used with -g, print title too ++\fB\-b\fR, \fB\-\-best-quality\fR ++try to download the best quality version diff --combined youtube-dl index cbb1182,56e770f..4a31968 --- a/youtube-dl +++ b/youtube-dl @@@ -46,6 -46,7 +46,7 @@@ const_timeout = 12 const_video_url_str = 'http://www.youtube.com/watch?v=%s' const_video_url_re = re.compile(r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$') + const_video_url_best_quality_suffix='&fmt=18' const_login_url_str = 'http://www.youtube.com/login?next=/watch%%3Fv%%3D%s' const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In' const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s' @@@ -71,20 -72,23 +72,23 @@@ def error_advice_exit(error_text) sys.exit('\n') # Wrapper to create custom requests with typical headers - def request_create(url, data=None): + def request_create(url, extra_headers, post_data): retval = urllib2.Request(url) - if data is not None: - retval.add_data(data) + if post_data is not None: + retval.add_data(post_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.11) Gecko/20071127 Firefox/2.0.0.11') retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7') retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5') retval.add_header('Accept-Language', 'en-us,en;q=0.5') + if extra_headers is not None: + for header in extra_headers: + retval.add_header(header[0], header[1]) return retval # Perform a request, process headers and return response - def perform_request(url, data=None): - request = request_create(url, data) + def perform_request(url, headers=None, data=None): + request = request_create(url, headers, data) response = urllib2.urlopen(request) return response @@@ -106,7 -110,7 +110,7 @@@ def title_string_norm(title) def download_step(return_data_flag, step_title, step_error, url, post_data=None): try: cond_print('%s... ' % step_title) - data = perform_request(url, post_data).read() + data = perform_request(url, data=post_data).read() cond_print('done.\n') if return_data_flag: return data @@@ -196,7 -200,7 +200,7 @@@ def title_string_touch(title) # Create the command line options parser and parse command line cmdl_usage = 'usage: %prog [options] video_url' - cmdl_version = '2008.01.24' + cmdl_version = '2008.03.08' 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') @@@ -210,6 -214,7 +214,7 @@@ cmdl_parser.add_option('-l', '--literal cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data') cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only') cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too') + cmdl_parser.add_option('-b', '--best-quality', action='store_true', dest='best_quality', help='try to download the best quality version') (cmdl_opts, cmdl_args) = cmdl_parser.parse_args() # Set socket timeout @@@ -227,6 -232,11 +232,11 @@@ if video_url_mo is None sys.exit('Error: URL does not seem to be a youtube video URL. If it is, report a bug.') video_url_id = video_url_mo.group(2) video_url = const_video_url_str % video_url_id + if cmdl_opts.best_quality: + video_url = '%s%s' % (video_url, const_video_url_best_quality_suffix) + video_extension = '.mp4' + else: + video_extension = '.flv' # Check conflicting options if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url): @@@ -276,7 -286,7 +286,7 @@@ else # Get output file name if cmdl_opts.outfile is None: - video_filename = '%s.flv' % video_url_id + video_filename = '%s%s' % (video_url_id, video_extension) else: video_filename = cmdl_opts.outfile @@@ -304,6 -314,8 +314,8 @@@ if cmdl_opts.use_title or cmdl_opts.use # Extract needed video URL parameters video_url_t_param = extract_step('Extracting URL "t" parameter', 'unable to extract URL "t" parameter', const_url_t_param_re, video_webpage) video_url_real = const_video_url_real_str % (video_url_id, video_url_t_param) + if cmdl_opts.best_quality: + video_url_real = '%s%s' % (video_url_real, const_video_url_best_quality_suffix) # Rebuild filename if needed if cmdl_opts.use_title or cmdl_opts.use_literal: @@@ -311,11 -323,11 +323,11 @@@ prefix = title_string_norm(video_title) else: prefix = title_string_touch(video_title) - video_filename = '%s-%s.flv' % (prefix, video_url_id) + video_filename = '%s-%s%s' % (prefix, video_url_id, video_extension) # Check name - if not video_filename.lower().endswith('.flv'): - sys.stderr.write('Warning: video file name does not end in .flv\n') + if not video_filename.lower().endswith(video_extension): + sys.stderr.write('Warning: video file name does not end in %s\n' % video_extension) # Retrieve video data try: @@@ -370,7 -382,7 +382,7 @@@ block_size = new_block_size(before, after, dl_bytes) if video_len is not None and byte_counter != video_len: - error_advice_exit('server did not send the expected ammount of data') + error_advice_exit('server did not send the expected amount of data') video_file.close() cond_print('done.\n')