X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/3628e7dbd71974381d77f4e43bf617c20760e3f6..788bdd3de995a4369aaa094f2f357733894b8367:/youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 8399e88..c2d195c 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1,6 +1,6 @@
 #!/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"),
@@ -40,16 +40,17 @@ import urllib2
 
 # 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://)?(?:\w+\.)?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'
 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)
-const_video_url_real_str = 'http://www.youtube.com/get_video?%s'
+const_url_t_param_re = re.compile(r"[,{]t:'([^']*)'")
+const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
 const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
 const_1k = 1024
 const_initial_block_size = 10 * const_1k
+const_epsilon = 0.0001
 
 # Print error message, followed by standard advice information, and then exit
 def error_advice_exit(error_text):
@@ -142,7 +143,7 @@ def new_block_size(before, after, bytes):
 	new_min = max(bytes / 2.0, 1.0)
 	new_max = max(bytes * 2.0, 1.0)
 	dif = after - before
-	if dif < 0.0001:
+	if dif < const_epsilon:
 		return int(new_max)
 	rate = bytes / dif
 	if rate > new_max:
@@ -173,9 +174,10 @@ def format_bytes(num_bytes):
 
 # Calculate ETA and return it in string format as MM:SS
 def calc_eta(start, now, total, current):
-	if current == 0:
+	dif = now - start
+	if current == 0 or dif < const_epsilon:
 		return '--:--'
-	rate = float(current) / (now - start)
+	rate = float(current) / dif
 	eta = long((total - current) / rate)
 	eta_mins = eta / 60
 	eta_secs = eta % 60
@@ -185,13 +187,14 @@ def calc_eta(start, now, total, current):
 
 # Calculate speed and return it in string format
 def calc_speed(start, now, bytes):
-	if bytes == 0:
+	dif = now - start
+	if bytes == 0 or dif < const_epsilon:
 		return 'N/A b'
-	return format_bytes(float(bytes) / (now - start))
+	return format_bytes(float(bytes) / dif)
 
 # 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.10.09'
 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')
@@ -204,6 +207,7 @@ cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', h
 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
@@ -216,7 +220,7 @@ video_url_cmdl = cmdl_args[0]
 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
@@ -239,6 +243,9 @@ if cmdl_opts.quiet and cmdl_opts.get_url:
 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
@@ -310,18 +317,23 @@ if account_username is not 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_url_params = extract_step('Extracting video URL parameters', 'unable to extract URL parameters', const_video_url_params_re, video_webpage)
-video_url_real = const_video_url_real_str % video_url_params
+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)
 
 # Retrieve video data
 try:
+	cond_print('Requesting video file... ')
 	video_data = perform_request(video_url_real)
+	cond_print('done.')
 	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()