Imported Debian patch 2006.11.12-1

[youtubedl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index dbd40b7bbcde8a7baccbf956eb37d327656ab771..0c2a48fec8c922d959ca22cbe98858a80a55a275 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -27,28 +27,28 @@
 #
 import sys
 import optparse
 #
 import sys
 import optparse

+import httplib

 import urllib2
 import re
 
 import urllib2
 import re
 

-# Exit status constants
-exit_failure = 1
-exit_success = 0
+# First off, check Python and refuse to run
+if sys.hexversion < 0x020400f0:
+       sys.exit('Error: Python 2.4 or later needed to run the program')

 
 # Global constants
 const_video_url_str = 'http://www.youtube.com/watch?v=%s'
 
 # 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)?\?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_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\?video_id=([^&]+)&.*t=([^&]+)&', re.M)
-const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
+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_1k = 1024
 const_block_size = 10 * const_1k
 
 # Print error message, followed by standard advice information, and then exit
 def error_advice_exit(error_text):
 const_1k = 1024
 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')
        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')


@@ -59,8 +59,9 @@ def error_advice_exit(error_text):
        sys.stderr.write('\tYouTube changed their system, and the program no longer works.\n')
        sys.stderr.write('\nTry to confirm you are able to view the video using a web browser.\n')
        sys.stderr.write('Use the same video URL and account information, if needed, with this program.\n')
        sys.stderr.write('\tYouTube changed their system, and the program no longer works.\n')
        sys.stderr.write('\nTry to confirm you are able to view the video using a web browser.\n')
        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.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):
 
 # Wrapper to create custom requests with typical headers
 def request_create(url, data=None):


@@ -68,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
        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')
        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')


@@ -94,7 +95,7 @@ def cond_print(str):
 
 # Create the command line options parser and parse command line
 cmdl_usage = 'usage: %prog [options] video_url'
 
 # Create the command line options parser and parse command line
 cmdl_usage = 'usage: %prog [options] video_url'

-cmdl_version = '2006.08.28'
+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')
 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')


@@ -108,13 +109,13 @@ cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate',
 # Get video URL
 if len(cmdl_args) != 1:
        cmdl_parser.print_help()
 # 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
 video_url_mo = const_video_url_re.match(video_url_cmdl)
 if video_url_mo is None:
 video_url_cmdl = cmdl_args[0]
 
 # Verify video URL format and convert to "standard" format
 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.\n')
+       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 = const_video_url_str % video_url_id
 
 video_url_id = video_url_mo.group(1)
 video_url = const_video_url_str % video_url_id
 


@@ -146,7 +147,8 @@ if not cmdl_opts.simulate:
        except (OSError, IOError):
                sys.exit('Error: unable to open %s for writing.' % video_filename)
 
        except (OSError, IOError):
                sys.exit('Error: unable to open %s for writing.' % video_filename)
 

-# Install cookie handler
+# Install cookie and proxy handlers
+urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))

 urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
 
 # Login and confirm age if needed
 urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
 
 # Login and confirm age if needed


@@ -154,15 +156,15 @@ if not cmdl_opts.username is None:
        try:
                # Log in
                cond_print('Logging in... ')
        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')
 
                cond_print('done.\n')
 

-       except (urllib2.URLError, ValueError):
+       except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError):

                cond_print('failed.\n')
                error_advice_exit('unable to login')
 
        except KeyboardInterrupt:
                cond_print('failed.\n')
                error_advice_exit('unable to login')
 
        except KeyboardInterrupt:

-               sys.exit(exit_failure)
+               sys.exit('\n')

 
        try:
                # Get age confirmation cookie
 
        try:
                # Get age confirmation cookie


@@ -170,26 +172,25 @@ if not cmdl_opts.username is None:
                perform_request(const_age_url_str % video_url_id, const_age_post_str % video_url_id).read()
                cond_print('done.\n')
 
                perform_request(const_age_url_str % video_url_id, const_age_post_str % video_url_id).read()
                cond_print('done.\n')
 

-       except (urllib2.URLError, ValueError):
+       except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError):

                cond_print('failed.\n')
                error_advice_exit('unable to confirm age')
 
        except KeyboardInterrupt:
                cond_print('failed.\n')
                error_advice_exit('unable to confirm age')
 
        except KeyboardInterrupt:

-               sys.exit(exit_failure)
+               sys.exit('\n')

 
 # Retrieve video webpage
 try:
        cond_print('Retrieving video webpage... ')
        video_webpage = perform_request(video_url).read()
 
 # Retrieve video webpage
 try:
        cond_print('Retrieving video webpage... ')
        video_webpage = perform_request(video_url).read()

+       cond_print('done.\n')

 
 

-except (urllib2.URLError, ValueError):
+except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError):

        cond_print('failed.\n')
        error_advice_exit('unable to download video webpage')
 
 except KeyboardInterrupt:
        cond_print('failed.\n')
        error_advice_exit('unable to download video webpage')
 
 except KeyboardInterrupt:

-       sys.exit(exit_failure)
-
-cond_print('done.\n')
+       sys.exit('\n')

 
 # Extract needed video URL parameters
 try:
 
 # Extract needed video URL parameters
 try:


@@ -200,13 +201,12 @@ try:
                cond_print('failed.\n')
                error_advice_exit('unable to extract URL parameters')
        
                cond_print('failed.\n')
                error_advice_exit('unable to extract URL parameters')
        

-       video_real_id = video_url_params_mo.group(1)
-       video_t_param = video_url_params_mo.group(2)
-       video_url_real = const_video_url_real_str % (video_real_id, video_t_param)
+       video_url_params = video_url_params_mo.group(1)
+       video_url_real = const_video_url_real_str % video_url_params

        cond_print('done.\n')
 
 except KeyboardInterrupt:
        cond_print('done.\n')
 
 except KeyboardInterrupt:

-       sys.exit(exit_failure)
+       sys.exit('\n')

 
 # Retrieve video data
 try:
 
 # Retrieve video data
 try:


@@ -233,14 +233,13 @@ try:
                video_block = video_data.read(const_block_size)
 
        video_file.close()
                video_block = video_data.read(const_block_size)
 
        video_file.close()

+       cond_print('done.\n')
+       cond_print('Video data saved to %s\n' % video_filename)
+       sys.exit()

 
 

-except (urllib2.URLError, ValueError):
+except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError):

        cond_print('failed.\n')
        error_advice_exit('unable to download video data')
 
 except KeyboardInterrupt:
        cond_print('failed.\n')
        error_advice_exit('unable to download video data')
 
 except KeyboardInterrupt:

-       sys.exit(exit_failure)
-
-cond_print('done.\n')
-cond_print('Video data saved to %s\n' % video_filename)
-sys.exit()
+       sys.exit('\n')