From: Rogério Brito Date: Sat, 18 Jun 2011 05:16:42 +0000 (-0300) Subject: Imported Upstream version 2006.11.12 X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/fa5a205482f47a5c79852b6cb4b1090413846206 Imported Upstream version 2006.11.12 --- diff --git a/youtube-dl b/youtube-dl index 84b3f8e..0c2a48f 100755 --- a/youtube-dl +++ b/youtube-dl @@ -35,15 +35,11 @@ import re if sys.hexversion < 0x020400f0: sys.exit('Error: Python 2.4 or later needed to run the program') -# Exit status constants -exit_failure = 1 -exit_success = 0 - # Global constants const_video_url_str = 'http://www.youtube.com/watch?v=%s' -const_video_url_re = re.compile(r'http://(?:www\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?v=)([^&]+).*') -const_login_url_str = 'http://www.youtube.com/signup?next=/' -const_login_post_str = 'current_form=loginForm&next=%%2F&username=%s&password=%s&action_login=Log+In' +const_video_url_re = re.compile(r'http://(?:www\d*\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?v=)([^&]+).*') +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' const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm' const_video_url_params_re = re.compile(r'player2\.swf\?([^"]+)"', re.M) @@ -53,7 +49,6 @@ const_block_size = 10 * const_1k # Print error message, followed by standard advice information, and then exit def error_advice_exit(error_text): - global exit_failure sys.stderr.write('Error: %s.\n' % error_text) sys.stderr.write('Try again several times. It may be a temporal problem.\n') sys.stderr.write('Other typical problems:\n\n') @@ -66,7 +61,7 @@ def error_advice_exit(error_text): sys.stderr.write('Use the same video URL and account information, if needed, with this program.\n') sys.stderr.write('When using a proxy, make sure http_proxy has http://host:port format.\n') sys.stderr.write('Try again several times and contact me if the problem persists.\n') - sys.exit(exit_failure) + sys.exit('\n') # Wrapper to create custom requests with typical headers def request_create(url, data=None): @@ -74,7 +69,7 @@ def request_create(url, data=None): if not data is 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.0.6) Gecko/20060728 Firefox/1.5.0.6') + 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') 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') @@ -100,7 +95,7 @@ def cond_print(str): # Create the command line options parser and parse command line cmdl_usage = 'usage: %prog [options] video_url' -cmdl_version = '2006.09.25' +cmdl_version = '2006.11.12' 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') @@ -114,7 +109,7 @@ cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', # Get video URL if len(cmdl_args) != 1: cmdl_parser.print_help() - sys.exit(exit_failure) + sys.exit('\n') video_url_cmdl = cmdl_args[0] # Verify video URL format and convert to "standard" format @@ -153,15 +148,15 @@ if not cmdl_opts.simulate: sys.exit('Error: unable to open %s for writing.' % video_filename) # Install cookie and proxy handlers -urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor())) urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler())) +urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor())) # Login and confirm age if needed if not cmdl_opts.username is None: try: # Log in cond_print('Logging in... ') - perform_request(const_login_url_str, const_login_post_str % (cmdl_opts.username, cmdl_opts.password)).read() + perform_request(const_login_url_str % video_url_id, const_login_post_str % (video_url_id, cmdl_opts.username, cmdl_opts.password)).read() cond_print('done.\n') except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError):