From 0111603ce468dd0b50fd4ab3b677b3933e5fabc3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
Date: Sat, 18 Jun 2011 02:16:47 -0300
Subject: [PATCH] Imported Upstream version 2008.01.24
---
youtube-dl | 113 ++++++++++++++++++++++-------------------------------
1 file changed, 46 insertions(+), 67 deletions(-)
diff --git a/youtube-dl b/youtube-dl
index c2d195c..1aa6123 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2006-2007 Ricardo Garcia Gonzalez
+# Copyright (c) 2006-2008 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"),
@@ -39,18 +39,20 @@ import time
import urllib2
# Global constants
+const_1k = 1024
+const_initial_block_size = 10 * const_1k
+const_epsilon = 0.0001
+const_timeout = 120
+
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_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_url_t_param_re = re.compile(r"[,{]t:'([^']*)'")
+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):
@@ -74,7 +76,7 @@ def request_create(url, data=None):
if data is not 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.1) Gecko/20061010 Firefox/2.0')
+ retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11')
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,10 +102,6 @@ def title_string_norm(title):
title = title.lower()
return title
-# Title string minimal transformation
-def title_string_touch(title):
- return title.replace(os.sep, '%')
-
# Generic download step
def download_step(return_data_flag, step_title, step_error, url, post_data=None):
try:
@@ -179,8 +177,7 @@ def calc_eta(start, now, total, current):
return '--:--'
rate = float(current) / dif
eta = long((total - current) / rate)
- eta_mins = eta / 60
- eta_secs = eta % 60
+ (eta_mins, eta_secs) = divmod(eta, 60)
if eta_mins > 99:
return '--:--'
return '%02d:%02d' % (eta_mins, eta_secs)
@@ -192,9 +189,14 @@ def calc_speed(start, now, bytes):
return 'N/A b'
return format_bytes(float(bytes) / dif)
+
+# Title string minimal transformation
+def title_string_touch(title):
+ return title.replace(os.sep, '%')
+
# Create the command line options parser and parse command line
cmdl_usage = 'usage: %prog [options] video_url'
-cmdl_version = '2007.10.09'
+cmdl_version = '2008.01.24'
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')
@@ -210,6 +212,9 @@ cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', h
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()
+# Set socket timeout
+socket.setdefaulttimeout(const_timeout)
+
# Get video URL
if len(cmdl_args) != 1:
cmdl_parser.print_help()
@@ -230,9 +235,6 @@ if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url):
if cmdl_opts.outfile is not None and (cmdl_opts.use_title or cmdl_opts.use_literal):
sys.exit('Error: using the video title conflicts with using a given file name.')
-if cmdl_opts.use_netrc and cmdl_opts.password is not None:
- sys.exit('Error: using netrc conflicts with giving command line password.')
-
if cmdl_opts.use_title and cmdl_opts.use_literal:
sys.exit('Error: cannot use title and literal title at the same time.')
@@ -243,6 +245,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.use_netrc and (cmdl_opts.username is not None or cmdl_opts.password is not None):
+ sys.exit('Error: cannot use netrc and username/password at the same time.')
+
if cmdl_opts.get_url is None and cmdl_opts.get_title is not None:
sys.exit('Error: getting title requires getting URL.')
@@ -255,30 +260,19 @@ if cmdl_opts.use_netrc:
info = netrc.netrc().authenticators('youtube')
if info is None:
sys.exit('Error: no authenticators for machine youtube.')
- netrc_username = info[0]
- netrc_password = info[2]
+ account_username = info[0]
+ account_password = info[2]
except IOError:
sys.exit('Error: unable to read .netrc file.')
except netrc.NetrcParseError:
sys.exit('Error: unable to parse .netrc file.')
-
-if cmdl_opts.password is not None:
- account_username = cmdl_opts.username
- account_password = cmdl_opts.password
else:
- if cmdl_opts.username is not None and cmdl_opts.use_netrc:
- if cmdl_opts.username != netrc_username:
- sys.exit('Error: conflicting username from .netrc and command line options.')
- account_username = cmdl_opts.username
- account_password = netrc_password
- elif cmdl_opts.username is not None:
- account_username = cmdl_opts.username
- account_password = getpass.getpass('Type YouTube password and press return: ')
- elif cmdl_opts.use_netrc:
- if len(netrc_username) == 0:
- sys.exit('Error: empty username in .netrc file.')
- account_username = netrc_username
- account_password = netrc_password
+ account_username = cmdl_opts.username
+ if account_username is not None:
+ if cmdl_opts.password is None:
+ account_password = getpass.getpass('Type YouTube password and press return: ')
+ else:
+ account_password = cmdl_opts.password
# Get output file name
if cmdl_opts.outfile is None:
@@ -286,19 +280,6 @@ if cmdl_opts.outfile is None:
else:
video_filename = cmdl_opts.outfile
-# Check name
-if not video_filename.lower().endswith('.flv'):
- sys.stderr.write('Warning: video file name does not end in .flv\n')
-
-# Test writable file
-if not (cmdl_opts.simulate or cmdl_opts.get_url):
- try:
- disk_test = open(video_filename, 'wb')
- disk_test.close()
-
- except (OSError, IOError):
- sys.exit('Error: unable to open %s for writing.' % video_filename)
-
# Install cookie and proxy handlers
urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
@@ -324,11 +305,23 @@ if cmdl_opts.use_title or cmdl_opts.use_literal or cmdl_opts.get_title:
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)
+# Rebuild filename if needed
+if cmdl_opts.use_title or cmdl_opts.use_literal:
+ if cmdl_opts.use_title:
+ prefix = title_string_norm(video_title)
+ else:
+ prefix = title_string_touch(video_title)
+ video_filename = '%s-%s.flv' % (prefix, video_url_id)
+
+# Check name
+if not video_filename.lower().endswith('.flv'):
+ sys.stderr.write('Warning: video file name does not end in .flv\n')
+
# Retrieve video data
try:
cond_print('Requesting video file... ')
video_data = perform_request(video_url_real)
- cond_print('done.')
+ cond_print('done.\n')
cond_print('Video data found at %s\n' % video_data.geturl())
if cmdl_opts.get_title:
@@ -340,7 +333,10 @@ try:
if cmdl_opts.simulate or cmdl_opts.get_url:
sys.exit()
- video_file = open(video_filename, 'wb')
+ try:
+ video_file = open(video_filename, 'wb')
+ except (IOError, OSError):
+ sys.exit('Error: unable to open "%s" for writing.' % video_filename)
try:
video_len = long(video_data.info()['Content-length'])
video_len_str = format_bytes(video_len)
@@ -387,22 +383,5 @@ except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.e
except KeyboardInterrupt:
sys.exit('\n')
-# Rename video file if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal:
- try:
- if cmdl_opts.use_title:
- prefix = title_string_norm(video_title)
- else:
- prefix = title_string_touch(video_title)
- final_filename = '%s-%s.flv' % (prefix, video_url_id)
- os.rename(video_filename, final_filename)
- cond_print('Video file renamed to %s\n' % final_filename)
-
- except OSError:
- sys.stderr.write('Warning: unable to rename file.\n')
-
- except KeyboardInterrupt:
- sys.exit('\n')
-
# Finish
sys.exit()
--
2.41.3