rpms/youtube-dl/F-10 Home, NONE, 1.1 youtube-dl, 1.1, 1.2 youtube-dl.spec, 1.1, 1.2

Rafał Psota rafalzaq at fedoraproject.org
Fri Oct 9 16:27:29 UTC 2009


Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20051

Modified Files:
	youtube-dl youtube-dl.spec 
Added Files:
	Home 
Log Message:
update to 2009.09.13


--- NEW FILE Home ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
	<title>
	rg3 / youtube-dl / wiki / Home — bitbucket.org
</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="description" content="Mercurial hosting - we're here to serve." />
	<meta name="keywords" content="mercurial,hg,hosting,bitbucket,rg3,youtube-dl,is,a,small,command-line,program,for,downloading,videos,from,YouTube.com.,wiki" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/layout.css?12985842" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" />
	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
	<link rel="icon" href="http://bitbucket.org/m/img/logo_new.png" type="image/png"/>
	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/bundle.180909Sep.js?2152820"></script>
	
	<script type="text/javascript">
		$(document).ready(function() {
			Dropdown.init();
			$(".tooltip").tipsy({gravity:'s'});
		});
	</script>
	<noscript>
		<style type="text/css">
			.dropdown-container-text .dropdown {
				position: static !important;
			}
		</style>
	</noscript>

	<!--[if lt IE 7]>
	<style type="text/css">
	body {
		behavior: url(http://bitbucket.org/m/css/csshover.htc);
	}
	
	#issues-issue pre {
		white-space: normal !important;
	}
	
	.changeset-description {
		white-space: normal !important;
	}
	</style>
	<script type="text/javascript"> 
		$(document).ready(function(){ 
			$('#header-wrapper').pngFix();
			$('#sourcelist').pngFix();
			$('.promo-signup-screenshot').pngFix();
		}); 
	</script>
	<![endif]-->
	
	<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" />
	<script type="text/javascript">
		$(document).ready(function() {
			$('#wiki table:not(.highlighttable)').addClass('wikitable');
			$('#wiki table.wikitable tr:even').addClass('crow2');
		});
	</script>

	
	<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />

</head>
<body class="">
	<div id="main-wrapper">
		<div id="header-wrapper">
			<div id="header">
				<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
				
					<div id="header-nav">
						<div id="header-nav-login-forms">
							<form action="/account/signin/" method="post">
								<fieldset>
									<input id="id_username_header" type="text" class="required login" name="username" value="username" maxlength="30" onfocus="if(this.value=='username'){this.value='';}; $(this).addClass('normaltext');" /> <input id="id_password_header" type="password" class="required login" name="password" value="password" maxlength="128" onfocus="if(this.value=='password'){this.value='';}; $(this).addClass('normaltext');" /> <input type="submit" name="blogin" value="»" style="display:none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
								</fieldset>
							</form>
							<form name="fopenid" action="/account/signin/" method="post">
								<fieldset>
									<input id="id_openid_url" type="text" class="required openid" name="openid_url" maxlength="255" value="your OpenID URL" onfocus="if(this.value=='your OpenID URL'){this.value='';}; $(this).addClass('normaltext');" /> <input name="bsignin" type="submit" value="»" style="display: none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home" />
								</fieldset>
							</form>
						</div>
						
						<ul class="right">
							<li><a href="/">Home</a></li>
							<li><a href="/plans/"><b>Plans & Signup</b></a></li>
							<li><a href="/repo/all/">Repositories</a></li>
							<li><a href="/news/">News</a></li>
							<li><a href="/help/">Help</a></li>
							<li><a href="/account/signin/">Login</a></li>
						</ul>
					</div>
				
			</div>
		</div>
		<div id="content-wrapper">
			
			
			

			
			
			
	
	





	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
	<script type="text/javascript">
		var date = new Date();
		date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
		var cookieoptions = { path: '/', expires: date };
		
		$(document).ready(function(){
			$('#toggle-repo-content').click(function(){
				$('#repo-desc-cloneinfo').toggle('fast');
				$('#repo-menu').toggle();
				$('#repo-menu-links-mini').toggle(100);
				$('.repo-desc-description').toggle('fast');
				var avatar_new_width = ($('.repo-avatar').width() == 35) ? 16 : 35;
				$('.repo-avatar').animate({ width: avatar_new_width }, 250);
				
				if ($.cookie('toggle_status') == 'hide') {
					$.cookie('toggle_status', 'show', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				} else {
					$.cookie('toggle_status', 'hide', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				}
			});
			
			if ($.cookie('toggle_status') == 'hide') {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				$('#repo-desc-cloneinfo').hide();
				$('#repo-menu').hide();
				$('#repo-menu-links-mini').show();
				$('.repo-desc-description').hide();
				$('.repo-avatar').css({ width: '16px' });
			} else {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				$('#repo-desc-cloneinfo').show();
				$('#repo-menu').show();
				$('#repo-menu-links-mini').hide();
				$('.repo-desc-description').show();
				$('.repo-avatar').css({ width: '35px' });
			}
		});
	</script>


<div id="tabs">
	<ul class="ui-tabs-nav">
		<li>
			<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a>
		</li>

		<li>
			<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a>
		</li>
		
		

		<li>
			
				<a href="/rg3/youtube-dl/src/"><span>Source</span></a>			
			
		</li>
		
		<li>
			<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a>
		</li>

		
			
				<li class="ui-tabs-nav-issues ui-tabs-selected">
					<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a>
				</li>
			
		

		
			
				<li class="ui-tabs-nav-issues">
					<a href="/rg3/youtube-dl/issues/?status=new&status=open"><span>Issues (4) »</span></a>
					<ul>
						<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=new&status=open">Open issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=resolved&status=invalid&status=duplicate">Closed issues</a></li>
					
						<li><a href="/rg3/youtube-dl/issues/">All issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/query/">Advanced query</a></li>
						<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li>
					</ul>
				</li>
			
		
				
		
			
		
		
		<li class="tabs-right tabs-far-right">
			<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a>
		</li>
		
		<li class="tabs-right">
			<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a>
		</li>
	</ul>
</div>

<div id="repo-menu">
		<div id="repo-menu-links">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="link-request-pull">
						pull request
					</a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="link-hack">patch queue</a></li>
				
				<li>
					
						<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a>
					
				</li>
				<li><a class="link-download">get source »</a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div id="repo-menu-branches-tags">
 			<ul>
				<li class="icon-branches">
					branches »
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li>
					
					</ul>
					
				</li>
				<li class="icon-tags">
					tags »
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li>
					
						<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li>
					
						<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li>
					
						<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li>
					
						<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li>
					
						<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li>
					
						<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li>
					
						<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li>
					
						<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li>
					
						<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</a></li>
					
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div class="cb"></div>
	</div>
	<div id="repo-desc" class="layout-box">
		
		
		<div id="repo-menu-links-mini" class="right">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="tooltip noborder link-hack" title="Patch queue"></a></li>
				
				<li><a class="tooltip noborder link-download" title="Get source"></a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		<h3>
			<a href="/rg3/">rg3</a> / 
			<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</a>
			 <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
			
		</h3>
		
		
		
		
		
		<p class="repo-desc-description">youtube-dl is a small command-line program for downloading videos from <a href="http://YouTube.com" rel="nofollow">YouTube.com</a>.</p>
		
		<div id="repo-desc-cloneinfo">Clone this repository (size: 199.5 KB): <a href="http://bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-ssh').hide();$('#clone-url-https').toggle();return(false);"><small>HTTPS</small></a> / <a href="ssh://hg@bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-https').hide();$('#clone-url-ssh').toggle();return(false);"><small>SSH</small></a><br/>
		<pre id="clone-url-https">$ hg clone <a href="http://bitbucket.org/rg3/youtube-dl/">http://bitbucket.org/rg3/youtube-dl/</a></pre>
		
		<pre id="clone-url-ssh" style="display:none;">$ hg clone <a href="ssh://hg@bitbucket.org/rg3/youtube-dl/">ssh://hg@bitbucket.org/rg3/youtube-dl/</a></pre></div>
		
		<div class="cb"></div>
		<a href="#" id="toggle-repo-content"></a>
	</div>


			
			

	

<div class="global-divider-header issues-nav">	
	<div id="wiki-nav-links">
		<span class="right">
			<nobr>
				<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small>
			</nobr>
		</span>
		
		
		<b><a href="/rg3/youtube-dl/wiki/Home" class="wiki-icon-home">Home</a></b>
		
		<a href="/rg3/youtube-dl/wiki/history/Home" class="wiki-icon-history">History</a>
		<a href="http://www.wikicreole.org/wiki/Creole1.0" class="wiki-icon-markup">Wiki Markup</a>
	</div>
	<div class="cb"></div>
</div>

	

	<div id="wiki">
		<p></p>
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2>
<p><em>youtube-dl</em> is a small command-line program to download videos from YouTube.com. It requires the <a href="http://www.python.org/">Python interpreter</a>, version 2.x (x being at least 4), and it's not platform specific. It should work in your Unix box, in Windows or in Mac OS X. The latest version is <strong>2009.09.13</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p>
<p>I'll try to keep it updated if YouTube.com changes the way you access their videos. After all, it's a simple and short program. However, I can't guarantee anything. If you detect it stops working, check for new versions and/or inform me about the problem, indicating the program version you are using. If the program stops working and I can't solve the problem but you have a solution, I'd like to know it. If that happens and you feel you can maintain the program yourself, tell me. My contact information is at <a href="http://rg03.wordpress.com/contact-me/">rg03.wordpress.com</a>.</p>
<p>Thanks for all the feedback received so far. I'm glad people find my program useful.</p>
<h2 id="usage-instructions">Usage instructions</h2>
<p>In Windows, once you have installed the Python interpreter, save the program with the <em>.py</em> extension and put it somewhere in the PATH. Try to follow the <a href="/rg3/youtube-dl/wiki/youtube-dl_under_Windows_XP">guide to install youtube-dl under Windows XP</a>.</p>
<p>In Unix, download it, give it execution permission and copy it to one of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
<p>After that, you should be able to call it from the command line as <em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em> in the following examples. Usage instructions are easy. Use <em>youtube-dl</em> followed by a video URL or identifier. Example: <em>youtube-dl "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. The video will be saved to the file <em>foobar.flv</em> in that example. As YouTube.com videos are in Flash Video format, their extension should be <em>flv</em>. In Linux and other unices, video players using a recent version of <em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two work under Windows and other platforms, but you could also get a specific FLV player of your taste.</p>
<p>If you try to run the program and you receive an error message containing the keyword <em>SyntaxError</em> near the end, it means your Python interpreter is too old.</p>
<h2 id="more-usage-tips">More usage tips</h2>
<ul><li>You can change the file name of the video using the -o option, like in <em>youtube-dl -o vid.flv "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. Read the Output template section for more details on this.
</li><li>Some videos require an account to be downloaded, mostly because they're flagged as mature content. You can pass the program a username and password for a YouTube.com account with the -u and -p options, like <em>youtube-dl -u myusername -p mypassword "<code>http://www.youtube.com/watch?v=foobar</code>"</em>.
</li><li>The account data can also be read from the user .netrc file by indicating the -n or --netrc option. The machine name is youtube in that case.
</li><li>The simulate mode (activated with -s or --simulate) can be used to just get the real video URL and use it with a download manager if you prefer that option.
</li><li>The quiet mode (activated with -q or --quiet) can be used to supress all output messages. This allows, in systems featuring <em>/dev/stdout</em> and other similar special files, outputting the video data to standard output in order to pipe it to another program without interferences.
</li><li>The program can be told to simply print the final video URL to standard output using the -g or --get-url option.
</li><li>In a similar line, the -e or --get-title option tells the program to print the video title.
</li><li>The default filename is video_id.flv. But you can also use the video title in the filename with the -t or --title option, or preserve the literal title in the filename with the -l or --literal option.
</li><li>You can make the program append <em>&fmt=something</em> to the URL by using the -f or --format option. This makes it possible to download high quality versions of the videos when available.
</li><li>The -b or --best-quality option can be used to download the highest available quality version of any given video.
</li><li>The -m or --mobile-version option is an alias for -f 17.
</li><li>The -d or --high-def option is an alias for -f 22.
</li><li>Normally, the program will stop on the first error, but you can tell it to attempt to download every video with the -i or --ignore-errors option.
</li><li>The -a or --batch-file option lets you specify a file to read URLs from. The file must contain one URL per line.
</li><li>The program can be told not to overwrite existing files using the -w or --no-overwrites option.
</li><li>It can be told to attempt to continue interrupted downloads with the -c or --continue option.
</li><li>For YouTube, you can also use the URL of a playlist, and it will download all the videos in that playlist.
</li><li>For YouTube, you can also use the special word ytsearch to download search results. With ytsearch it will download the first search result. With ytsearchN, where N is a number, it will download the first N results. With ytsearchall it will download every result for that search. In most systems you'll need to use quotes for multiple words. Example: <em>youtube-dl "ytsearch3:cute kittens"</em>.
</li><li><em>youtube-dl</em> honors the http_proxy environment variable if you want to use a proxy. Set it to something like <em><code>http://proxy.example.com:8080</code></em>, and do not leave the <em><code>http://</code></em> prefix out.
</li><li>You can get the program version by calling it as <em>youtube-dl -v</em> or <em>youtube-dl --version</em>.
</li><li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl --help</em>.
</li><li>You can cancel the program at any time pressing Ctrl+C. It may print some error lines saying something about <em>KeyboardInterrupt</em>. That's ok.
</li></ul>
<h2 id="download-it">Download it</h2>
<p>Note that if you directly click on these hyperlinks, your web browser will most likely display the program contents. It's usually better to right-click on it and choose the appropriate option, normally called <em>Save Target As</em> or <em>Save Link As</em>, depending on the web browser you are using.</p>
<h3 id="httpbitbucketorgrg3youtube-dlraw20090913youtube-dl20090913"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2009.09.13/youtube-dl">2009.09.13</a></h3>
<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980
</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b
</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe
</li></ul>
<h3 id="output-template">Output template</h3>
<p>The -o option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in <em>youtube-dl -o funny_video.flv "<code>http://some/video</code>"</em>. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format <strong>%(NAME)s</strong>. To clarify, that's a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:</p>
<ul><li><em>id</em>: The sequence will be replaced by the video identifier.
</li><li><em>url</em>: The sequence will be replaced by the video URL.
</li><li><em>uploader</em>: The sequence will be replaced by the nickname of the person who uploaded the video.
</li><li><em>title</em>: The sequence will be replaced by the literal video title.
</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes.
</li><li><em>ext</em>: The sequence will be replaced by the appropriate extension (like <em>flv</em> or <em>mp4</em>).
</li><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
</li></ul>
<p>As you may have guessed, the default template is <em>%(id)s.%(ext)s</em>. When some command line options are used, it's replaced by other templates like <em>%(title)s-%(id)s.%(ext)s</em>. You can specify your own.</p>
<h2 id="authors">Authors</h2>
<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
</li><li>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
</li><li>Many other people contributing patches, code, ideas and kind messages. Too many to be listed here. You know who you are. Thank you very much.
</li></ul>
<p>Copyright © 2006-2009 Ricardo Garcia Gonzalez</p>

		
		
	</div>


			<div class="cb"></div>
		</div>
		<div class="cb footer-placeholder"></div>
	</div>
	<div id="footer-wrapper">
		<div id="footer">
			<a href="/site/terms/">TOS</a> | <a href="/site/privacy/">Privacy Policy</a> | <a href="http://blog.bitbucket.org/">Blog</a> | <a href="http://bitbucket.org/jespern/bitbucket/issues/new/">Report Bug</a> | <a href="http://groups.google.com/group/bitbucket-users">Discuss</a> | <a href="http://avantlumiere.com/">© 2008-2009</a>
			| We run <small><b>
				<a href="http://www.djangoproject.com/">Django 1.1.0</a> / 
				<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</a> / 
				<a href="http://www.selenic.com/mercurial/">Hg 1.3.1</a> / 
				<a href="http://www.python.org">Python 2.5.2</a> /
				r2687
			</b></small>
		</div>
	</div>
	<script type="text/javascript">
	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
	</script>
	<script type="text/javascript">
	var pt = _gat._getTracker("UA-2456069-3");
	pt._trackPageview();
	</script>
</body>
</html>


Index: youtube-dl
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-10/youtube-dl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl	9 Oct 2009 16:27:29 -0000	1.2
@@ -1,387 +1,1228 @@
 #!/usr/bin/env python
-#
-# 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"),
-# 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.
-#
-import getpass
+# -*- coding: utf-8 -*-
+# Author: Ricardo Garcia Gonzalez
+# Author: Danny Colligan
+# License: Public domain code
+import htmlentitydefs
 import httplib
+import locale
 import math
 import netrc
-import optparse
 import os
+import os.path
 import re
 import socket
 import string
 import sys
 import time
+import urllib
 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_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)
-
-# Print error message, followed by standard advice information, and then exit
-def error_advice_exit(error_text):
-	sys.stderr.write('Error: %s.\n' % error_text)
-	sys.stderr.write('Try again several times. It may be a temporary problem.\n')
-	sys.stderr.write('Other typical problems:\n\n')
-	sys.stderr.write('* Video no longer exists.\n')
-	sys.stderr.write('* Video requires age confirmation but you did not provide an account.\n')
-	sys.stderr.write('* You provided the account data, but it is not valid.\n')
-	sys.stderr.write('* The connection was cut suddenly for some reason.\n')
-	sys.stderr.write('* YouTube 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.exit('\n')
-
-# Wrapper to create custom requests with typical headers
-def request_create(url, data=None):
-	retval = urllib2.Request(url)
-	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.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')
-	return retval
-
-# Perform a request, process headers and return response
-def perform_request(url, data=None):
-	request = request_create(url, data)
-	response = urllib2.urlopen(request)
-	return response
-
-# Conditional print
-def cond_print(str):
-	global cmdl_opts
-	if not (cmdl_opts.quiet or cmdl_opts.get_url):
-		sys.stdout.write(str)
-		sys.stdout.flush()
-
-# Title string normalization
-def title_string_norm(title):
-	title = ''.join((x in string.ascii_letters or x in string.digits) and x or ' ' for x in title)
-	title = '_'.join(title.split())
-	title = title.lower()
-	return title
-
-# Generic download step
-def download_step(return_data_flag, step_title, step_error, url, post_data=None):
+std_headers = {
+	'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
+	'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+	'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+	'Accept-Language': 'en-us,en;q=0.5',
+}
+
+simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
+
+def preferredencoding():
+	"""Get preferred encoding.
+
+	Returns the best encoding scheme for the system, based on
+	locale.getpreferredencoding() and some further tweaks.
+	"""
 	try:
-		cond_print('%s... ' % step_title)
-		data = perform_request(url, post_data).read()
-		cond_print('done.\n')
-		if return_data_flag:
-			return data
-		return None
-
-	except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-		cond_print('failed.\n')
-		error_advice_exit(step_error)
-
-	except KeyboardInterrupt:
-		sys.exit('\n')
+		pref = locale.getpreferredencoding()
+		# Mac OSX systems have this problem sometimes
+		if pref == '':
+			return 'UTF-8'
+		return pref
+	except:
+		sys.stderr.write('WARNING: problem obtaining preferred encoding. Falling back to UTF-8.\n')
+		return 'UTF-8'
 
-# Generic extract step
-def extract_step(step_title, step_error, regexp, data):
-	try:
-		cond_print('%s... ' % step_title)
-		match = regexp.search(data)
-		
-		if match is None:
-			cond_print('failed.\n')
-			error_advice_exit(step_error)
-		
-		extracted_data = match.group(1)
-		cond_print('done.\n')
-		return extracted_data
+class DownloadError(Exception):
+	"""Download Error exception.
 	
-	except KeyboardInterrupt:
-		sys.exit('\n')
-
-# Calculate new block size based on previous block size
-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 < const_epsilon:
-		return int(new_max)
-	rate = bytes / dif
-	if rate > new_max:
-		return int(new_max)
-	if rate < new_min:
-		return int(new_min)
-	return int(rate)
-
-# Get optimum 1k exponent to represent a number of bytes
-def optimum_k_exp(num_bytes):
-	global const_1k
-	if num_bytes == 0:
-		return 0
-	return long(math.log(num_bytes, const_1k))
-
-# Get optimum representation of number of bytes
-def format_bytes(num_bytes):
-	global const_1k
-	try:
-		exp = optimum_k_exp(num_bytes)
-		suffix = 'bkMGTPEZY'[exp]
-		if exp == 0:
-			return '%s%s' % (num_bytes, suffix)
-		converted = float(num_bytes) / float(const_1k**exp)
+	This exception may be thrown by FileDownloader objects if they are not
+	configured to continue on errors. They will contain the appropriate
+	error message.
+	"""
+	pass
+
+class SameFileError(Exception):
+	"""Same File exception.
+
+	This exception will be thrown by FileDownloader objects if they detect
+	multiple files would have to be downloaded to the same file on disk.
+	"""
+	pass
+
+class PostProcessingError(Exception):
+	"""Post Processing exception.
+
+	This exception may be raised by PostProcessor's .run() method to
+	indicate an error in the postprocessing task.
+	"""
+	pass
+
+class UnavailableFormatError(Exception):
+	"""Unavailable Format exception.
+
+	This exception will be thrown when a video is requested
+	in a format that is not available for that video.
+	"""
+	pass
+
+class ContentTooShortError(Exception):
+	"""Content Too Short exception.
+
+	This exception may be raised by FileDownloader objects when a file they
+	download is too small for what the server announced first, indicating
+	the connection was probably interrupted.
+	"""
+	# Both in bytes
+	downloaded = None
+	expected = None
+
+	def __init__(self, downloaded, expected):
+		self.downloaded = downloaded
+		self.expected = expected
+
+class FileDownloader(object):
+	"""File Downloader class.
+
+	File downloader objects are the ones responsible of downloading the
+	actual video file and writing it to disk if the user has requested
+	it, among some other tasks. In most cases there should be one per
+	program. As, given a video URL, the downloader doesn't know how to
+	extract all the needed information, task that InfoExtractors do, it
+	has to pass the URL to one of them.
+
+	For this, file downloader objects have a method that allows
+	InfoExtractors to be registered in a given order. When it is passed
+	a URL, the file downloader handles it to the first InfoExtractor it
+	finds that reports being able to handle it. The InfoExtractor extracts
+	all the information about the video or videos the URL refers to, and
+	asks the FileDownloader to process the video information, possibly
+	downloading the video.
+
+	File downloaders accept a lot of parameters. In order not to saturate
+	the object constructor with arguments, it receives a dictionary of
+	options instead. These options are available through the params
+	attribute for the InfoExtractors to use. The FileDownloader also
+	registers itself as the downloader in charge for the InfoExtractors
+	that are added to it, so this is a "mutual registration".
+
+	Available options:
+
+	username:	Username for authentication purposes.
+	password:	Password for authentication purposes.
+	usenetrc:	Use netrc for authentication instead.
+	quiet:		Do not print messages to stdout.
+	forceurl:	Force printing final URL.
+	forcetitle:	Force printing title.
+	simulate:	Do not download the video files.
+	format:		Video format code.
+	outtmpl:	Template for output names.
+	ignoreerrors:	Do not stop on download errors.
+	ratelimit:	Download speed limit, in bytes/sec.
+	nooverwrites:	Prevent overwriting files.
+	continuedl:	Try to continue downloads if possible.
+	"""
+
+	params = None
+	_ies = []
+	_pps = []
+	_download_retcode = None
+
+	def __init__(self, params):
+		"""Create a FileDownloader object with the given options."""
+		self._ies = []
+		self._pps = []
+		self._download_retcode = 0
+		self.params = params
+	
+	@staticmethod
+	def pmkdir(filename):
+		"""Create directory components in filename. Similar to Unix "mkdir -p"."""
+		components = filename.split(os.sep)
+		aggregate = [os.sep.join(components[0:x]) for x in xrange(1, len(components))]
+		aggregate = ['%s%s' % (x, os.sep) for x in aggregate] # Finish names with separator
+		for dir in aggregate:
+			if not os.path.exists(dir):
+				os.mkdir(dir)
+	
+	@staticmethod
+	def format_bytes(bytes):
+		if bytes is None:
+			return 'N/A'
+		if type(bytes) is str:
+			bytes = float(bytes)
+		if bytes == 0.0:
+			exponent = 0
+		else:
+			exponent = long(math.log(bytes, 1024.0))
+		suffix = 'bkMGTPEZY'[exponent]
+		converted = float(bytes) / float(1024**exponent)
 		return '%.2f%s' % (converted, suffix)
-	except IndexError:
-		sys.exit('Error: internal error formatting number of bytes.')
-
-# Calculate ETA and return it in string format as MM:SS
-def calc_eta(start, now, total, current):
-	dif = now - start
-	if current == 0 or dif < const_epsilon:
-		return '--:--'
-	rate = float(current) / dif
-	eta = long((total - current) / rate)
-	(eta_mins, eta_secs) = divmod(eta, 60)
-	if eta_mins > 99:
-		return '--:--'
-	return '%02d:%02d' % (eta_mins, eta_secs)
-
-# Calculate speed and return it in string format
-def calc_speed(start, now, bytes):
-	dif = now - start
-	if bytes == 0 or dif < const_epsilon:
-		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 = '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')
-cmdl_parser.add_option('-u', '--username', dest='username', metavar='USERNAME', help='account username')
-cmdl_parser.add_option('-p', '--password', dest='password', metavar='PASSWORD', help='account password')
-cmdl_parser.add_option('-o', '--output', dest='outfile', metavar='FILE', help='output video file name')
-cmdl_parser.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode')
-cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video')
-cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-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()
-
-# Set socket timeout
-socket.setdefaulttimeout(const_timeout)
-
-# Get video URL
-if len(cmdl_args) != 1:
-	cmdl_parser.print_help()
-	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:
-	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(2)
-video_url = const_video_url_str % video_url_id
-
-# Check conflicting options
-if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url):
-	sys.stderr.write('Warning: video file name given but will not be used.\n')
-
-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_title and cmdl_opts.use_literal:
-	sys.exit('Error: cannot use title and literal title at the same time.')
-
-if cmdl_opts.quiet and cmdl_opts.get_url:
-	sys.exit('Error: cannot be quiet and print final URL at the same time.')
-
-# Incorrect option formatting
-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.')
-
-# Get account information if any
-account_username = None
-account_password = None
 
-if cmdl_opts.use_netrc:
-	try:
-		info = netrc.netrc().authenticators('youtube')
-		if info is None:
-			sys.exit('Error: no authenticators for machine youtube.')
-		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.')
-else:
-	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: ')
+	@staticmethod
+	def calc_percent(byte_counter, data_len):
+		if data_len is None:
+			return '---.-%'
+		return '%6s' % ('%3.1f%%' % (float(byte_counter) / float(data_len) * 100.0))
+
+	@staticmethod
+	def calc_eta(start, now, total, current):
+		if total is None:
+			return '--:--'
+		dif = now - start
+		if current == 0 or dif < 0.001: # One millisecond
+			return '--:--'
+		rate = float(current) / dif
+		eta = long((float(total) - float(current)) / rate)
+		(eta_mins, eta_secs) = divmod(eta, 60)
+		if eta_mins > 99:
+			return '--:--'
+		return '%02d:%02d' % (eta_mins, eta_secs)
+
+	@staticmethod
+	def calc_speed(start, now, bytes):
+		dif = now - start
+		if bytes == 0 or dif < 0.001: # One millisecond
+			return '%10s' % '---b/s'
+		return '%10s' % ('%s/s' % FileDownloader.format_bytes(float(bytes) / dif))
+
+	@staticmethod
+	def best_block_size(elapsed_time, bytes):
+		new_min = max(bytes / 2.0, 1.0)
+		new_max = min(max(bytes * 2.0, 1.0), 4194304) # Do not surpass 4 MB
+		if elapsed_time < 0.001:
+			return long(new_max)
+		rate = bytes / elapsed_time
+		if rate > new_max:
+			return long(new_max)
+		if rate < new_min:
+			return long(new_min)
+		return long(rate)
+
+	@staticmethod
+	def parse_bytes(bytestr):
+		"""Parse a string indicating a byte quantity into a long integer."""
+		matchobj = re.match(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$', bytestr)
+		if matchobj is None:
+			return None
+		number = float(matchobj.group(1))
+		multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
+		return long(round(number * multiplier))
+
+	@staticmethod
+	def verify_url(url):
+		"""Verify a URL is valid and data could be downloaded. Return real data URL."""
+		request = urllib2.Request(url, None, std_headers)
+		data = urllib2.urlopen(request)
+		data.read(1)
+		url = data.geturl()
+		data.close()
+		return url
+
+	def add_info_extractor(self, ie):
+		"""Add an InfoExtractor object to the end of the list."""
+		self._ies.append(ie)
+		ie.set_downloader(self)
+	
+	def add_post_processor(self, pp):
+		"""Add a PostProcessor object to the end of the chain."""
+		self._pps.append(pp)
+		pp.set_downloader(self)
+	
+	def to_stdout(self, message, skip_eol=False):
+		"""Print message to stdout if not in quiet mode."""
+		if not self.params.get('quiet', False):
+			print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+			sys.stdout.flush()
+	
+	def to_stderr(self, message):
+		"""Print message to stderr."""
+		print >>sys.stderr, message.encode(preferredencoding())
+	
+	def fixed_template(self):
+		"""Checks if the output template is fixed."""
+		return (re.search(ur'(?u)%\(.+?\)s', self.params['outtmpl']) is None)
+
+	def trouble(self, message=None):
+		"""Determine action to take when a download problem appears.
+
+		Depending on if the downloader has been configured to ignore
+		download errors or not, this method may throw an exception or
+		not when errors are found, after printing the message.
+		"""
+		if message is not None:
+			self.to_stderr(message)
+		if not self.params.get('ignoreerrors', False):
+			raise DownloadError(message)
+		self._download_retcode = 1
+
+	def slow_down(self, start_time, byte_counter):
+		"""Sleep if the download speed is over the rate limit."""
+		rate_limit = self.params.get('ratelimit', None)
+		if rate_limit is None or byte_counter == 0:
+			return
+		now = time.time()
+		elapsed = now - start_time
+		if elapsed <= 0.0:
+			return
+		speed = float(byte_counter) / elapsed
+		if speed > rate_limit:
+			time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
+
+	def report_destination(self, filename):
+		"""Report destination filename."""
+		self.to_stdout(u'[download] Destination: %s' % filename)
+	
+	def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
+		"""Report download progress."""
+		self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
+				(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
+
+	def report_resuming_byte(self, resume_len):
+		"""Report attemtp to resume at given byte."""
+		self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+	
+	def report_file_already_downloaded(self, file_name):
+		"""Report file has already been fully downloaded."""
+		self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+	
+	def report_unable_to_resume(self):
+		"""Report it was impossible to resume download."""
+		self.to_stdout(u'[download] Unable to resume')
+	
+	def report_finish(self):
+		"""Report download finished."""
+		self.to_stdout(u'')
+
+	def process_info(self, info_dict):
+		"""Process a single dictionary returned by an InfoExtractor."""
+		# Do nothing else if in simulate mode
+		if self.params.get('simulate', False):
+			try:
+				info_dict['url'] = self.verify_url(info_dict['url'])
+			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
+				raise UnavailableFormatError
+
+			# Forced printings
+			if self.params.get('forcetitle', False):
+				print info_dict['title'].encode(preferredencoding())
+			if self.params.get('forceurl', False):
+				print info_dict['url'].encode(preferredencoding())
+
+			return
+			
+		try:
+			template_dict = dict(info_dict)
+			template_dict['epoch'] = unicode(long(time.time()))
+			filename = self.params['outtmpl'] % template_dict
+		except (ValueError, KeyError), err:
+			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+		if self.params['nooverwrites'] and os.path.exists(filename):
+			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
+			return
+
+		try:
+			self.pmkdir(filename)
+		except (OSError, IOError), err:
+			self.trouble('ERROR: unable to create directories: %s' % str(err))
+			return
+
+		try:
+			success = self._do_download(filename, info_dict['url'])
+		except (OSError, IOError), err:
+			raise UnavailableFormatError
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self.trouble('ERROR: unable to download video data: %s' % str(err))
+			return
+		except (ContentTooShortError, ), err:
+			self.trouble('ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+			return
+
+		if success:
+			try:
+				self.post_process(filename, info_dict)
+			except (PostProcessingError), err:
+				self.trouble('ERROR: postprocessing: %s' % str(err))
+				return
+
+	def download(self, url_list):
+		"""Download a given list of URLs."""
+		if len(url_list) > 1 and self.fixed_template():
+			raise SameFileError(self.params['outtmpl'])
+
+		for url in url_list:
+			suitable_found = False
+			for ie in self._ies:
+				# Go to next InfoExtractor if not suitable
+				if not ie.suitable(url):
+					continue
+
+				# Suitable InfoExtractor found
+				suitable_found = True
+
+				# Extract information from URL and process it
+				ie.extract(url)
+
+				# Suitable InfoExtractor had been found; go to next URL
+				break
+
+			if not suitable_found:
+				self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
+
+		return self._download_retcode
+
+	def post_process(self, filename, ie_info):
+		"""Run the postprocessing chain on the given file."""
+		info = dict(ie_info)
+		info['filepath'] = filename
+		for pp in self._pps:
+			info = pp.run(info)
+			if info is None:
+				break
+	
+	def _do_download(self, filename, url):
+		stream = None
+		open_mode = 'ab'
+
+		basic_request = urllib2.Request(url, None, std_headers)
+		request = urllib2.Request(url, None, std_headers)
+
+		# Attempt to resume download with "continuedl" option
+		if os.path.isfile(filename):
+			resume_len = os.path.getsize(filename)
 		else:
-			account_password = cmdl_opts.password
-
-# Get output file name 
-if cmdl_opts.outfile is None:
-	video_filename = '%s.flv' % video_url_id
-else:
-	video_filename = cmdl_opts.outfile
-
-# Install cookie and proxy handlers
-urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
-urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
-
-# Log in and confirm age if needed
-if account_username is not None:
-	url = const_login_url_str % video_url_id
-	post = const_login_post_str % (video_url_id, account_username, account_password)
-	download_step(False, 'Logging in', 'unable to log in', url, post)
-
-	url = const_age_url_str % video_url_id
-	post = const_age_post_str % video_url_id
-	download_step(False, 'Confirming age', 'unable to confirm age', url, post)
-
-# Retrieve video webpage
-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 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_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.\n')
-	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()
-
-	if cmdl_opts.simulate or cmdl_opts.get_url:
-		sys.exit()
+			resume_len = 0
+		if self.params['continuedl'] and resume_len != 0:
+			self.report_resuming_byte(resume_len)
+			request.add_header('Range','bytes=%d-' % resume_len)
+
+		# Establish connection
+		try:
+			data = urllib2.urlopen(request)
+		except (urllib2.HTTPError, ), err:
+			if err.code != 416: #  416 is 'Requested range not satisfiable'
+				raise
+			data = urllib2.urlopen(basic_request)
+			content_length = data.info()['Content-Length']
+			if content_length is not None and long(content_length) == resume_len:
+				self.report_file_already_downloaded(filename)
+				return True
+			else:
+				self.report_unable_to_resume()
+				open_mode = 'wb'
+
+		data_len = data.info().get('Content-length', None)
+		data_len_str = self.format_bytes(data_len)
+		byte_counter = 0
+		block_size = 1024
+		start = time.time()
+		while True:
+			# Download and write
+			before = time.time()
+			data_block = data.read(block_size)
+			after = time.time()
+			data_block_len = len(data_block)
+			if data_block_len == 0:
+				break
+			byte_counter += data_block_len
+
+			# Open file just in time
+			if stream is None:
+				try:
+					stream = open(filename, open_mode)
+					self.report_destination(filename)
+				except (OSError, IOError), err:
+					self.trouble('ERROR: unable to open for writing: %s' % str(err))
+					return False
+			stream.write(data_block)
+			block_size = self.best_block_size(after - before, data_block_len)
+
+			# Progress message
+			percent_str = self.calc_percent(byte_counter, data_len)
+			eta_str = self.calc_eta(start, time.time(), data_len, byte_counter)
+			speed_str = self.calc_speed(start, time.time(), byte_counter)
+			self.report_progress(percent_str, data_len_str, speed_str, eta_str)
+
+			# Apply rate limit
+			self.slow_down(start, byte_counter)
+
+		self.report_finish()
+		if data_len is not None and str(byte_counter) != data_len:
+			raise ContentTooShortError(byte_counter, long(data_len))
+		return True
+
+class InfoExtractor(object):
+	"""Information Extractor class.
+
+	Information extractors are the classes that, given a URL, extract
+	information from the video (or videos) the URL refers to. This
+	information includes the real video URL, the video title and simplified
+	title, author and others. The information is stored in a dictionary
+	which is then passed to the FileDownloader. The FileDownloader
+	processes this information possibly downloading the video to the file
+	system, among other possible outcomes. The dictionaries must include
+	the following fields:
+
+	id:		Video identifier.
+	url:		Final video URL.
+	uploader:	Nickname of the video uploader.
+	title:		Literal title.
+	stitle:		Simplified title.
+	ext:		Video filename extension.
+
+	Subclasses of this one should re-define the _real_initialize() and
+	_real_extract() methods, as well as the suitable() static method.
+	Probably, they should also be instantiated and added to the main
+	downloader.
+	"""
+
+	_ready = False
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		"""Constructor. Receives an optional downloader."""
+		self._ready = False
+		self.set_downloader(downloader)
+
+	@staticmethod
+	def suitable(url):
+		"""Receives a URL and returns True if suitable for this IE."""
+		return False
+
+	def initialize(self):
+		"""Initializes an instance (authentication, etc)."""
+		if not self._ready:
+			self._real_initialize()
+			self._ready = True
+
+	def extract(self, url):
+		"""Extracts URL information and returns it in list of dicts."""
+		self.initialize()
+		return self._real_extract(url)
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this IE."""
+		self._downloader = downloader
+	
+	def _real_initialize(self):
+		"""Real initialization process. Redefine in subclasses."""
+		pass
+
+	def _real_extract(self, url):
+		"""Real extraction process. Redefine in subclasses."""
+		pass
+
+class YoutubeIE(InfoExtractor):
+	"""Information extractor for youtube.com."""
+
+	_VALID_URL = r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:\.php)?)?\?(?:.+&)?v=)))?([0-9A-Za-z_-]+)(?(1).+)?$'
+	_LANG_URL = r'http://uk.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
+	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
+	_NETRC_MACHINE = 'youtube'
+	_available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+	_video_extensions = {
+		'13': '3gp',
+		'17': 'mp4',
+		'18': 'mp4',
+		'22': 'mp4',
+	}
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeIE._VALID_URL, url) is not None)
+
+	@staticmethod
+	def htmlentity_transform(matchobj):
+		"""Transforms an HTML entity to a Unicode character."""
+		entity = matchobj.group(1)
+
+		# Known non-numeric HTML entity
+		if entity in htmlentitydefs.name2codepoint:
+			return unichr(htmlentitydefs.name2codepoint[entity])
+
+		# Unicode character
+		mobj = re.match(ur'(?u)#(x?\d+)', entity)
+		if mobj is not None:
+			numstr = mobj.group(1)
+			if numstr.startswith(u'x'):
+				base = 16
+				numstr = u'0%s' % numstr
+			else:
+				base = 10
+			return unichr(long(numstr, base))
+
+		# Unknown entity in name, return its literal representation
+		return (u'&%s;' % entity)
+
+	def report_lang(self):
+		"""Report attempt to set language."""
+		self._downloader.to_stdout(u'[youtube] Setting language')
+
+	def report_login(self):
+		"""Report attempt to log in."""
+		self._downloader.to_stdout(u'[youtube] Logging in')
+	
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[youtube] Confirming age')
+	
+	def report_video_info_webpage_download(self, video_id):
+		"""Report attempt to download video info webpage."""
+		self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
+	
+	def report_information_extraction(self, video_id):
+		"""Report attempt to extract video information."""
+		self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
+	
+	def report_unavailable_format(self, video_id, format):
+		"""Report extracted video URL."""
+		self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
+	
+	def _real_initialize(self):
+		if self._downloader is None:
+			return
+
+		username = None
+		password = None
+		downloader_params = self._downloader.params
+
+		# Attempt to use provided username and password or .netrc data
+		if downloader_params.get('username', None) is not None:
+			username = downloader_params['username']
+			password = downloader_params['password']
+		elif downloader_params.get('usenetrc', False):
+			try:
+				info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+				if info is not None:
+					username = info[0]
+					password = info[2]
+				else:
+					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
+			except (IOError, netrc.NetrcParseError), err:
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % str(err))
+				return
+
+		# Set language
+		request = urllib2.Request(self._LANG_URL, None, std_headers)
+		try:
+			self.report_lang()
+			urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % str(err))
+			return
+
+		# No authentication to be performed
+		if username is None:
+			return
+
+		# Log in
+		login_form = {
+				'current_form': 'loginForm',
+				'next':		'/',
+				'action_login':	'Log In',
+				'username':	username,
+				'password':	password,
+				}
+		request = urllib2.Request(self._LOGIN_URL, urllib.urlencode(login_form), std_headers)
+		try:
+			self.report_login()
+			login_results = urllib2.urlopen(request).read()
+			if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:
+				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
+				return
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % str(err))
+			return
+	
+		# Confirm age
+		age_form = {
+				'next_url':		'/',
+				'action_confirm':	'Confirm',
+				}
+		request = urllib2.Request(self._AGE_URL, urllib.urlencode(age_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			age_results = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+
+	def _real_extract(self, url):
+		# Extract video id from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+		video_id = mobj.group(2)
+
+		# Downloader parameters
+		best_quality = False
+		format_param = None
+		quality_index = 0
+		if self._downloader is not None:
+			params = self._downloader.params
+			format_param = params.get('format', None)
+			if format_param == '0':
+				format_param = self._available_formats[quality_index]
+				best_quality = True
+
+		while True:
+			# Extension
+			video_extension = self._video_extensions.get(format_param, 'flv')
+
+			# Get video info
+			video_info_url = 'http://www.youtube.com/get_video_info?&video_id=%s&el=detailpage&ps=default&eurl=&gl=US&hl=en' % video_id
+			request = urllib2.Request(video_info_url, None, std_headers)
+			try:
+				self.report_video_info_webpage_download(video_id)
+				video_info_webpage = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
+				return
+			self.report_information_extraction(video_id)
+
+			# "t" param
+			mobj = re.search(r'(?m)&token=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				# Attempt to see if YouTube has issued an error message
+				mobj = re.search(r'(?m)&reason=([^&]+)(?:&|$)', video_info_webpage)
+				if mobj is None:
+					self._downloader.trouble(u'ERROR: unable to extract "t" parameter for unknown reason')
+					stream = open('reportme-ydl-%s.dat' % time.time(), 'wb')
+					stream.write(video_info_webpage)
+					stream.close()
+				else:
+					reason = urllib.unquote_plus(mobj.group(1))
+					self._downloader.trouble(u'ERROR: YouTube said: %s' % reason.decode('utf-8'))
+				return
+			token = urllib.unquote(mobj.group(1))
+			video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
+			if format_param is not None:
+				video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
+
+			# uploader
+			mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+				return
+			video_uploader = urllib.unquote(mobj.group(1))
+
+			# title
+			mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract video title')
+				return
+			video_title = urllib.unquote(mobj.group(1))
+			video_title = video_title.decode('utf-8')
+			video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
+			video_title = video_title.replace(os.sep, u'%')
+
+			# simplified title
+			simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+			simple_title = simple_title.strip(ur'_')
+
+			try:
+				# Process video information
+				self._downloader.process_info({
+					'id':		video_id.decode('utf-8'),
+					'url':		video_real_url.decode('utf-8'),
+					'uploader':	video_uploader.decode('utf-8'),
+					'title':	video_title,
+					'stitle':	simple_title,
+					'ext':		video_extension.decode('utf-8'),
+				})
+
+				return
+
+			except UnavailableFormatError, err:
+				if best_quality:
+					if quality_index == len(self._available_formats) - 1:
+						# I don't ever expect this to happen
+						self._downloader.trouble(u'ERROR: no known formats available for video')
+						return
+					else:
+						self.report_unavailable_format(video_id, format_param)
+						quality_index += 1
+						format_param = self._available_formats[quality_index]
+						continue
+				else: 
+					self._downloader.trouble('ERROR: format not available for video')
+					return
+
+
+class MetacafeIE(InfoExtractor):
+	"""Information Extractor for metacafe.com."""
+
+	_VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+	_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
+	_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(MetacafeIE._VALID_URL, url) is not None)
+
+	def report_disclaimer(self):
+		"""Report disclaimer retrieval."""
+		self._downloader.to_stdout(u'[metacafe] Retrieving disclaimer')
+
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[metacafe] Confirming age')
+	
+	def report_download_webpage(self, video_id):
+		"""Report webpage download."""
+		self._downloader.to_stdout(u'[metacafe] %s: Downloading webpage' % video_id)
+	
+	def report_extraction(self, video_id):
+		"""Report information extraction."""
+		self._downloader.to_stdout(u'[metacafe] %s: Extracting information' % video_id)
+
+	def _real_initialize(self):
+		# Retrieve disclaimer
+		request = urllib2.Request(self._DISCLAIMER, None, std_headers)
+		try:
+			self.report_disclaimer()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
+			return
+
+		# Confirm age
+		disclaimer_form = {
+			'filters': '0',
+			'submit': "Continue - I'm over 18",
+			}
+		request = urllib2.Request(self._FILTER_POST, urllib.urlencode(disclaimer_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+	
+	def _real_extract(self, url):
+		# Extract id and simplified title from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+
+		video_id = mobj.group(1)
+
+		# Check if video comes from YouTube
+		mobj2 = re.match(r'^yt-(.*)$', video_id)
+		if mobj2 is not None:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % mobj2.group(1))
+			return
+
+		simple_title = mobj.group(2).decode('utf-8')
+		video_extension = 'flv'
+
+		# Retrieve video webpage to extract further information
+		request = urllib2.Request('http://www.metacafe.com/watch/%s/' % video_id)
+		try:
+			self.report_download_webpage(video_id)
+			webpage = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % str(err))
+			return
+
+		# Extract URL, uploader and title from webpage
+		self.report_extraction(video_id)
+		mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract media URL')
+			return
+		mediaURL = urllib.unquote(mobj.group(1))
+
+		#mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
+		#if mobj is None:
+		#	self._downloader.trouble(u'ERROR: unable to extract gdaKey')
+		#	return
+		#gdaKey = mobj.group(1)
+		#
+		#video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
+
+		video_url = mediaURL
+
+		mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract title')
+			return
+		video_title = mobj.group(1).decode('utf-8')
+
+		mobj = re.search(r'(?ms)<li id="ChnlUsr">.*?Submitter:.*?<a .*?>(.*?)<', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+			return
+		video_uploader = mobj.group(1)
+
+		try:
+			# Process video information
+			self._downloader.process_info({
+				'id':		video_id.decode('utf-8'),
+				'url':		video_url.decode('utf-8'),
+				'uploader':	video_uploader.decode('utf-8'),
+				'title':	video_title,
+				'stitle':	simple_title,
+				'ext':		video_extension.decode('utf-8'),
+			})
+		except UnavailableFormatError:
+			self._downloader.trouble(u'ERROR: format not available for video')
+
+
+class YoutubeSearchIE(InfoExtractor):
+	"""Information Extractor for YouTube search queries."""
+	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
+	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
+	_youtube_ie = None
+	_max_youtube_results = 1000
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeSearchIE._VALID_QUERY, url) is not None)
+
+	def report_download_page(self, query, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
 
-	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)
-	except KeyError:
-		video_len = None
-		video_len_str = 'N/A'
-
-	byte_counter = 0
-	block_size = const_initial_block_size
-	start_time = time.time()
-	while True:
-		if video_len is not None:
-			percent = float(byte_counter) / float(video_len) * 100.0
-			percent_str = '%.1f' % percent
-			eta_str = calc_eta(start_time, time.time(), video_len, byte_counter)
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, query):
+		mobj = re.match(self._VALID_QUERY, query)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid search query "%s"' % query)
+			return
+
+		prefix, query = query.split(':')
+		prefix = prefix[8:]
+		if prefix == '':
+			self._download_n_results(query, 1)
+			return
+		elif prefix == 'all':
+			self._download_n_results(query, self._max_youtube_results)
+			return
 		else:
-			percent_str = '---.-'
-			eta_str = '--:--'
-		counter = format_bytes(byte_counter)
-		speed_str = calc_speed(start_time, time.time(), byte_counter)
-		cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str))
-
-		before = time.time()
-		video_block = video_data.read(block_size)
-		after = time.time()
-		dl_bytes = len(video_block)
-		if dl_bytes == 0:
-			break
-		byte_counter += dl_bytes
-		video_file.write(video_block)
-		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')
-
-	video_file.close()
-	cond_print('done.\n')
-	cond_print('Video data saved to %s\n' % video_filename)
-
-except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-	cond_print('failed.\n')
-	error_advice_exit('unable to download video data')
+			try:
+				n = long(prefix)
+				if n <= 0:
+					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+					return
+				elif n > self._max_youtube_results:
+					self._downloader.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+					n = self._max_youtube_results
+				self._download_n_results(query, n)
+				return
+			except ValueError: # parsing prefix as integer fails
+				self._download_n_results(query, 1)
+				return
+
+	def _download_n_results(self, query, n):
+		"""Downloads a specified number of results for a query"""
+
+		video_ids = []
+		already_seen = set()
+		pagenum = 1
+
+		while True:
+			self.report_download_page(query, pagenum)
+			result_url = self._TEMPLATE_URL % (urllib.quote_plus(query), pagenum)
+			request = urllib2.Request(result_url, None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				video_id = page[mobj.span()[0]:mobj.span()[1]].split('=')[2][:-1]
+				if video_id not in already_seen:
+					video_ids.append(video_id)
+					already_seen.add(video_id)
+					if len(video_ids) == n:
+						# Specified n videos reached
+						for id in video_ids:
+							self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+						return
+
+			if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+				for id in video_ids:
+					self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+				return
+
+			pagenum = pagenum + 1
+
+class YoutubePlaylistIE(InfoExtractor):
+	"""Information Extractor for YouTube playlists."""
+
+	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
+	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
+	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubePlaylistIE._VALID_URL, url) is not None)
+
+	def report_download_page(self, playlist_id, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
 
-except KeyboardInterrupt:
-	sys.exit('\n')
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, url):
+		# Extract playlist id
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid url: %s' % url)
+			return
+
+		# Download playlist pages
+		playlist_id = mobj.group(1)
+		video_ids = []
+		pagenum = 1
+
+		while True:
+			self.report_download_page(playlist_id, pagenum)
+			request = urllib2.Request(self._TEMPLATE_URL % (playlist_id, pagenum), None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			ids_in_page = []
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				if mobj.group(1) not in ids_in_page:
+					ids_in_page.append(mobj.group(1))
+			video_ids.extend(ids_in_page)
+
+			if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
+				break
+			pagenum = pagenum + 1
+
+		for id in video_ids:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+		return
+
+class PostProcessor(object):
+	"""Post Processor class.
+
+	PostProcessor objects can be added to downloaders with their
+	add_post_processor() method. When the downloader has finished a
+	successful download, it will take its internal chain of PostProcessors
+	and start calling the run() method on each one of them, first with
+	an initial argument and then with the returned value of the previous
+	PostProcessor.
+
+	The chain will be stopped if one of them ever returns None or the end
+	of the chain is reached.
+
+	PostProcessor objects follow a "mutual registration" process similar
+	to InfoExtractor objects.
+	"""
+
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		self._downloader = downloader
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this PP."""
+		self._downloader = downloader
+	
+	def run(self, information):
+		"""Run the PostProcessor.
 
-# Finish
-sys.exit()
+		The "information" argument is a dictionary like the ones
+		composed by InfoExtractors. The only difference is that this
+		one has an extra field called "filepath" that points to the
+		downloaded file.
+
+		When this method returns None, the postprocessing chain is
+		stopped. However, this method may return an information
+		dictionary that will be passed to the next postprocessing
+		object in the chain. It can be the one it received after
+		changing some fields.
+
+		In addition, this method may raise a PostProcessingError
+		exception that will be taken into account by the downloader
+		it was called from.
+		"""
+		return information # by default, do nothing
+	
+### MAIN PROGRAM ###
+if __name__ == '__main__':
+	try:
+		# Modules needed only when running the main program
+		import getpass
+		import optparse
+
+		# General configuration
+		urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
+		urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
+		socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
+		# Parse command line
+		parser = optparse.OptionParser(
+			usage='Usage: %prog [options] url...',
+			version='2009.09.13',
+			conflict_handler='resolve',
+		)
+
+		parser.add_option('-h', '--help',
+				action='help', help='print this help text and exit')
+		parser.add_option('-v', '--version',
+				action='version', help='print program version and exit')
+		parser.add_option('-i', '--ignore-errors',
+				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
+		parser.add_option('-r', '--rate-limit',
+				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+
+		authentication = optparse.OptionGroup(parser, 'Authentication Options')
+		authentication.add_option('-u', '--username',
+				dest='username', metavar='UN', help='account username')
+		authentication.add_option('-p', '--password',
+				dest='password', metavar='PW', help='account password')
+		authentication.add_option('-n', '--netrc',
+				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
+		parser.add_option_group(authentication)
+
+		video_format = optparse.OptionGroup(parser, 'Video Format Options')
+		video_format.add_option('-f', '--format',
+				action='store', dest='format', metavar='FMT', help='video format code')
+		video_format.add_option('-b', '--best-quality',
+				action='store_const', dest='format', help='download the best quality video possible', const='0')
+		video_format.add_option('-m', '--mobile-version',
+				action='store_const', dest='format', help='alias for -f 17', const='17')
+		video_format.add_option('-d', '--high-def',
+				action='store_const', dest='format', help='alias for -f 22', const='22')
+		parser.add_option_group(video_format)
+
+		verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
+		verbosity.add_option('-q', '--quiet',
+				action='store_true', dest='quiet', help='activates quiet mode', default=False)
+		verbosity.add_option('-s', '--simulate',
+				action='store_true', dest='simulate', help='do not download video', default=False)
+		verbosity.add_option('-g', '--get-url',
+				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
+		verbosity.add_option('-e', '--get-title',
+				action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+		parser.add_option_group(verbosity)
+
+		filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
+		filesystem.add_option('-t', '--title',
+				action='store_true', dest='usetitle', help='use title in file name', default=False)
+		filesystem.add_option('-l', '--literal',
+				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
+		filesystem.add_option('-o', '--output',
+				dest='outtmpl', metavar='TPL', help='output filename template')
+		filesystem.add_option('-a', '--batch-file',
+				dest='batchfile', metavar='F', help='file containing URLs to download')
+		filesystem.add_option('-w', '--no-overwrites',
+				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
+		filesystem.add_option('-c', '--continue',
+				action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
+		parser.add_option_group(filesystem)
+
+		(opts, args) = parser.parse_args()
+
+		# Batch file verification
+		batchurls = []
+		if opts.batchfile is not None:
+			try:
+				batchurls = open(opts.batchfile, 'r').readlines()
+				batchurls = [x.strip() for x in batchurls]
+				batchurls = [x for x in batchurls if len(x) > 0]
+			except IOError:
+				sys.exit(u'ERROR: batch file could not be read')
+		all_urls = batchurls + args
+
+		# Conflicting, missing and erroneous options
+		if len(all_urls) < 1:
+			parser.error(u'you must provide at least one URL')
+		if opts.usenetrc and (opts.username is not None or opts.password is not None):
+			parser.error(u'using .netrc conflicts with giving username/password')
+		if opts.password is not None and opts.username is None:
+			parser.error(u'account username missing')
+		if opts.outtmpl is not None and (opts.useliteral or opts.usetitle):
+			parser.error(u'using output template conflicts with using title or literal title')
+		if opts.usetitle and opts.useliteral:
+			parser.error(u'using title conflicts with using literal title')
+		if opts.username is not None and opts.password is None:
+			opts.password = getpass.getpass(u'Type account password and press return:')
+		if opts.ratelimit is not None:
+			numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
+			if numeric_limit is None:
+				parser.error(u'invalid rate limit specified')
+			opts.ratelimit = numeric_limit
+
+		# Information extractors
+		youtube_ie = YoutubeIE()
+		metacafe_ie = MetacafeIE(youtube_ie)
+		youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
+		youtube_search_ie = YoutubeSearchIE(youtube_ie)
+
+		# File downloader
+		fd = FileDownloader({
+			'usenetrc': opts.usenetrc,
+			'username': opts.username,
+			'password': opts.password,
+			'quiet': (opts.quiet or opts.geturl or opts.gettitle),
+			'forceurl': opts.geturl,
+			'forcetitle': opts.gettitle,
+			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
+			'format': opts.format,
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
+				or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
+				or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
+				or u'%(id)s.%(ext)s'),
+			'ignoreerrors': opts.ignoreerrors,
+			'ratelimit': opts.ratelimit,
+			'nooverwrites': opts.nooverwrites,
+			'continuedl': opts.continue_dl,
+			})
+		fd.add_info_extractor(youtube_search_ie)
+		fd.add_info_extractor(youtube_pl_ie)
+		fd.add_info_extractor(metacafe_ie)
+		fd.add_info_extractor(youtube_ie)
+		retcode = fd.download(all_urls)
+		sys.exit(retcode)
+
+	except DownloadError:
+		sys.exit(1)
+	except SameFileError:
+		sys.exit(u'ERROR: fixed output name but more than one file to download')
+	except KeyboardInterrupt:
+		sys.exit(u'\nERROR: Interrupted by user')


Index: youtube-dl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-10/youtube-dl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl.spec	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl.spec	9 Oct 2009 16:27:29 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           youtube-dl
-Version:        2008.01.24
-Release:        1%{?dist}
+Version:        2009.09.13
+Release:        2%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Summary(pl):    Tekstowy program do pobierania filmów z youtube.com
 Group:          Applications/Multimedia
-License:        MIT
-URL:            http://www.arrakis.es/~rggi3/youtube-dl/
-Source0:        http://www.arrakis.es/~rggi3/youtube-dl/youtube-dl
-Source1:        http://www.arrakis.es/~rggi3/youtube-dl/index.html
+License:        Public Domain
+URL:            http://bitbucket.org/rg3/youtube-dl
+Source0:        http://bitbucket.org/rg3/youtube-dl/raw/%{version}/youtube-dl
+Source1:        http://bitbucket.org/rg3/youtube-dl/wiki/Home
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       python >= 2.4
@@ -20,7 +20,7 @@ youtube-dl to mały tekstowy program sł
 youtube.com.
 
 %prep
-cp %{SOURCE1} .
+install -p -m0644 %{SOURCE1} index.html
 
 %build
 #nothing to build
@@ -39,6 +39,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc index.html
 
 %changelog
+* Fri Oct 09 2009 Rafał Psota <rafalzaq at gmail.com> - 2009.09.13-2
+- Small fix in %%prep
+
+* Sun Sep 27 2009 Rafał Psota <rafalzaq at gmail.com> - 2009.09.13-1
+- Update to 2009.09.13
+- License change to Public Domain
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 26 2008 Krzysztof Kurzawski <kurzawax at gmail.com> 2008.01.24-1
 - Update to v2008.01.24
 - Add polish summary and description.




More information about the fedora-extras-commits mailing list