--- /dev/null
++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 <edmonds@debian.org> 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 <edmonds@debian.org> 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 <edmonds@debian.org> 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 <edmonds@debian.org> 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 <edmonds@debian.org> Sun, 10 Dec 2006 13:52:36 -0500
+
+youtube-dl (2006.11.12-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Robert S. Edmonds <edmonds@debian.org> 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 <edmonds@debian.org> Wed, 27 Sep 2006 17:43:07 -0400
+
+youtube-dl (2006.08.28-1) unstable; urgency=low
+
+ * Initial release, closes: #385748.
+
+ -- Robert S. Edmonds <edmonds@debian.org> Sun, 3 Sep 2006 19:43:27 -0400
+
--- /dev/null
- Copyright 2006 Ricardo Garcia Gonzalez
+This package was debianized by Robert S. Edmonds <edmonds@debian.org> on
+Sun, 3 Sep 2006 19:43:27 -0400.
+
+It was downloaded from http://www.arrakis.es/~rggi3/youtube-dl/
+
+Copyright Holder:
+
++Copyright 2006-2007 Ricardo Garcia Gonzalez
+
+License:
+
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+
+The Debian packaging is (C) 2006, Robert S. Edmonds <edmonds@debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- /dev/null
- .TH YOUTUBE-DL "1" "April 2007" "youtube-dl" "User Commands"
++.TH YOUTUBE-DL "1" "June 2007" "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
#!/usr/bin/env python
#
- # Copyright (c) 2006 Ricardo Garcia Gonzalez
+ # Copyright (c) 2006-2007 Ricardo Garcia Gonzalez
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# Global constants
const_video_url_str = 'http://www.youtube.com/watch?v=%s'
- const_video_url_re = re.compile(r'(?:http://)?(?:www\d*\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=)([^&]+).*')
+ const_video_url_re = re.compile(r'^((?:http://)?(?:www\d*\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
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'
# Create the command line options parser and parse command line
cmdl_usage = 'usage: %prog [options] video_url'
- cmdl_version = '2007.03.27'
+ cmdl_version = '2007.06.06'
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')
cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
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_opts, cmdl_args) = cmdl_parser.parse_args()
# Get video URL
video_url_mo = const_video_url_re.match(video_url_cmdl)
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(1)
+ video_url_id = video_url_mo.group(2)
video_url = const_video_url_str % video_url_id
# Check conflicting options
if cmdl_opts.username is None and cmdl_opts.password is not None:
sys.exit('Error: password give but username is missing.')
+ if cmdl_opts.get_url is None and cmdl_opts.get_title is not None:
+ sys.exit('Error: getting title requires getting URL.')
+
# Get account information if any
account_username = None
account_password = None
video_webpage = download_step(True, 'Retrieving video webpage', 'unable to retrieve video webpage', video_url)
# Extract video title if needed
- if cmdl_opts.use_title or cmdl_opts.use_literal:
+ if cmdl_opts.use_title or cmdl_opts.use_literal or cmdl_opts.get_title:
video_title = extract_step('Extracting video title', 'unable to extract video title', const_video_title_re, video_webpage)
# Extract needed video URL parameters
video_data = perform_request(video_url_real)
cond_print('Video data found at %s\n' % video_data.geturl())
+ if cmdl_opts.get_title:
+ print video_title
+
if cmdl_opts.get_url:
print video_data.geturl()
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')
Rapsys Git / youtubedl / commitdiff