From: Robert S. Edmonds Date: Wed, 26 Mar 2008 17:19:23 +0000 (-0400) Subject: Imported Debian patch 2008.03.22-1 X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/90f68a0c2ee165f5ce003db763677a8cf72730d8?hp=-c Imported Debian patch 2008.03.22-1 --- 90f68a0c2ee165f5ce003db763677a8cf72730d8 diff --combined debian/changelog index 61a7caa,0000000..e599230 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,90 -1,0 +1,97 @@@ ++youtube-dl (2008.03.22-1) unstable; urgency=low ++ ++ * New upstream release: ++ - adds -f / --format command line option. ++ ++ -- Robert S. Edmonds Wed, 26 Mar 2008 13:19:23 -0400 ++ +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 864123f,0000000..fecffc2 mode 100644,000000..100644 --- a/debian/youtube-dl.1 +++ b/debian/youtube-dl.1 @@@ -1,44 -1,0 +1,48 @@@ +.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 ++.TP ++\fB\-f\fR FORMAT, \fB\-\-format\fR=\fIFORMAT\fR ++append &fmt=FORMAT to the URL ++.TP +\fB\-b\fR, \fB\-\-best-quality\fR +try to download the best quality version diff --combined youtube-dl index 4a31968,ba27e75..52f1e3f --- a/youtube-dl +++ b/youtube-dl @@@ -46,7 -46,8 +46,8 @@@ 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_video_url_format_suffix = '&fmt=%s' + const_best_quality_format = 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' @@@ -200,7 -201,7 +201,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.03.08' + cmdl_version = '2008.03.22' 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') @@@ -214,7 -215,8 +215,8 @@@ 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_parser.add_option('-f', '--format', dest='video_format', metavar='FORMAT', help='append &fmt=FORMAT to the URL') + cmdl_parser.add_option('-b', '--best-quality', action='store_true', dest='best_quality', help='alias for -f 18') (cmdl_opts, cmdl_args) = cmdl_parser.parse_args() # Set socket timeout @@@ -232,12 -234,22 +234,22 @@@ 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 + + video_format = None if cmdl_opts.best_quality: - video_url = '%s%s' % (video_url, const_video_url_best_quality_suffix) + video_format = const_best_quality_format video_extension = '.mp4' else: video_extension = '.flv' + if cmdl_opts.video_format is not None: + if video_format is not None and video_format != cmdl_opts.video_format: + sys.exit('Error: conflicting video formats specified\n') + video_format = cmdl_opts.video_format + + if video_format is not None: + video_url = '%s%s' % (video_url, const_video_url_format_suffix % video_format) + # Check conflicting options if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url): sys.stderr.write('Warning: video file name given but will not be used.\n') @@@ -314,8 -326,8 +326,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) + if video_format is not None: + video_url_real = '%s%s' % (video_url_real, const_video_url_format_suffix % video_format) # Rebuild filename if needed if cmdl_opts.use_title or cmdl_opts.use_literal: @@@ -382,7 -394,7 +394,7 @@@ try 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')