- Update to latest release

epel9
Till Maas 15 years ago
parent 10b697701b
commit b57b741159

46
Home

@ -207,7 +207,7 @@
<li class="ui-tabs-nav-issues"> <li class="ui-tabs-nav-issues">
<a href="/rg3/youtube-dl/issues?status=new&amp;status=open"><span>Issues (11) &raquo;</span></a> <a href="/rg3/youtube-dl/issues?status=new&amp;status=open"><span>Issues (10) &raquo;</span></a>
<ul> <ul>
<li><a href="/rg3/youtube-dl/issues?status=new">New issues</a></li> <li><a href="/rg3/youtube-dl/issues?status=new">New issues</a></li>
<li><a href="/rg3/youtube-dl/issues?status=new&amp;status=open">Open issues</a></li> <li><a href="/rg3/youtube-dl/issues?status=new&amp;status=open">Open issues</a></li>
@ -226,11 +226,11 @@
<li class="tabs-right tabs-far-right"> <li class="tabs-right tabs-far-right">
<a href="/rg3/youtube-dl/descendants"><span>Forks/Queues (8)</span></a> <a href="/rg3/youtube-dl/descendants"><span>Forks/Queues (9)</span></a>
</li> </li>
<li class="tabs-right"> <li class="tabs-right">
<a href="/rg3/youtube-dl/zealots"><span>Followers (58)</span></a> <a href="/rg3/youtube-dl/zealots"><span>Followers (62)</span></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -265,9 +265,9 @@
<ul> <ul>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.zip" class="zip">zip</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/9029984a65c1.zip" class="zip">zip</a></li>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.gz" class="compressed">gz</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/9029984a65c1.gz" class="compressed">gz</a></li>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.bz2" class="compressed">bz2</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/9029984a65c1.bz2" class="compressed">bz2</a></li>
</ul> </ul>
@ -283,7 +283,7 @@
<ul> <ul>
<li><a href="/rg3/youtube-dl/src/be549f3809e6">default</a></li> <li><a href="/rg3/youtube-dl/src/9029984a65c1">default</a></li>
</ul> </ul>
@ -293,7 +293,9 @@
<ul> <ul>
<li><a href="/rg3/youtube-dl/src/be549f3809e6">tip</a></li> <li><a href="/rg3/youtube-dl/src/9029984a65c1">tip</a></li>
<li><a href="/rg3/youtube-dl/src/ebc3c1a8ea94">2010.06.06</a></li>
<li><a href="/rg3/youtube-dl/src/1d3bca5d5e5d">2010.04.04</a></li> <li><a href="/rg3/youtube-dl/src/1d3bca5d5e5d">2010.04.04</a></li>
@ -335,8 +337,6 @@
<li><a href="/rg3/youtube-dl/src/ee7b97092712">2009.01.31</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/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/9636c1843c6f">2008.09.20</a></li>
@ -378,9 +378,9 @@
<ul> <ul>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.zip" class="zip">zip</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/9029984a65c1.zip" class="zip">zip</a></li>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.gz" class="compressed">gz</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/9029984a65c1.gz" class="compressed">gz</a></li>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.bz2" class="compressed">bz2</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/9029984a65c1.bz2" class="compressed">bz2</a></li>
</ul> </ul>
@ -401,7 +401,7 @@
<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> <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: 255.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/> <div id="repo-desc-cloneinfo">Clone this repository (size: 269.0 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-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> <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>
@ -443,7 +443,7 @@
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1> <h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p> <p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2> <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>2010.04.04</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p> <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>2010.06.06</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>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> <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> <h2 id="usage-instructions">Usage instructions</h2>
@ -477,10 +477,10 @@
</li></ul> </li></ul>
<h2 id="download-it">Download it</h2> <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> <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-dlraw20100404youtube-dl20100404"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2010.04.04/youtube-dl">2010.04.04</a></h3> <h3 id="httpbitbucketorgrg3youtube-dlraw20100606youtube-dl20100606"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2010.06.06/youtube-dl">2010.06.06</a></h3>
<ul><li><strong>MD5</strong>: 6c3e2982b5a46ede4fd5d6e6ed280331 <ul><li><strong>MD5</strong>: a995ba360c5b0fbd2a22c48306367cc5
</li><li><strong>SHA1</strong>: 2edaa9a95f26bbd1e871314f3fd5e8e87b1bd576 </li><li><strong>SHA1</strong>: 8f077dee718d5057ed4fe7a2173bbded0fb941f6
</li><li><strong>SHA256</strong>: 69aa7757feb01c5faf68414a0220bed1e9210900059b1a7d7c7f2c53e788ae26 </li><li><strong>SHA256</strong>: 690f5b91e536f426de0679d2c69d1e0c37904d21a47fbabb89d374ef9504b096
</li></ul> </li></ul>
<h3 id="output-template">Output template</h3> <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> <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>
@ -504,6 +504,12 @@
<br/>
<small class="right" style="background: transparent url(http://bitbucket-assets.s3.amazonaws.com/img/icons/fugue/clock_small.png) no-repeat left 50%; padding-left: 16px;">
This revision is from 2010-06-06 18:15
</small>
<div class="cb"></div>
</div> </div>
@ -519,7 +525,7 @@
<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</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.selenic.com/mercurial/">Hg 1.3.1</a> /
<a href="http://www.python.org">Python 2.5.2</a> / <a href="http://www.python.org">Python 2.5.2</a> /
r2890| fe01 r2988| fe01
</b></small> </b></small>
</div> </div>
</div> </div>

@ -8,11 +8,13 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="description" content="Mercurial hosting - we're here to serve." /> <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" /> <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-assets.s3.amazonaws.com/css/layout.css" />
<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" /> <meta name="google-site-verification" content="GLJMpoIUjgWhrjaR6XRvBOZqe-JbiFVzUhs5iOJ1iI8" />
<link rel="stylesheet" type="text/css" href="http://bitbucket-assets.s3.amazonaws.com/css/screen.css" />
<link rel="stylesheet" type="text/css" href="http://bitbucket-assets.s3.amazonaws.com/css/print.css" media="print" />
<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" /> <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"/> <link rel="icon" href="http://bitbucket-assets.s3.amazonaws.com/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" src="http://bitbucket-assets.s3.amazonaws.com/js/lib/bundle.160310Mar.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
@ -31,7 +33,7 @@
<!--[if lt IE 7]> <!--[if lt IE 7]>
<style type="text/css"> <style type="text/css">
body { body {
behavior: url(http://bitbucket.org/m/css/csshover.htc); behavior: url(http://bitbucket-assets.s3.amazonaws.com/css/csshover.htc);
} }
#issues-issue pre { #issues-issue pre {
@ -51,7 +53,7 @@
</script> </script>
<![endif]--> <![endif]-->
<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" /> <link rel="stylesheet" href="http://bitbucket-assets.s3.amazonaws.com/css/highlight/trac.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('#wiki table:not(.highlighttable)').addClass('wikitable'); $('#wiki table:not(.highlighttable)').addClass('wikitable');
@ -60,14 +62,28 @@
</script> </script>
<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" /> <link href="/rg3/youtube-dl/rss" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-2456069-3'], ['_trackPageview']);
var _gaq = _gaq || [];
_gaq.push(['atl._setAccount', 'UA-6032469-33'], ['atl._trackPageview']);
(function() {
var ga = document.createElement('script');
ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
ga.setAttribute('async', 'true');
document.documentElement.firstChild.appendChild(ga);
})();
</script>
</head> </head>
<body class=""> <body class="">
<div id="main-wrapper"> <div id="main-wrapper">
<div id="header-wrapper"> <div id="header-wrapper">
<div id="header"> <div id="header">
<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a> <a href="/"><img src="http://bitbucket-assets.s3.amazonaws.com/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
<div id="header-nav"> <div id="header-nav">
<div id="header-nav-login-forms"> <div id="header-nav-login-forms">
@ -75,6 +91,7 @@
<fieldset> <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="&raquo;" style="display:none;" /> <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="&raquo;" style="display:none;" />
<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/> <input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
</fieldset> </fieldset>
</form> </form>
<form name="fopenid" action="/account/signin/" method="post"> <form name="fopenid" action="/account/signin/" method="post">
@ -87,10 +104,10 @@
<ul class="right"> <ul class="right">
<li><a href="/">Home</a></li> <li><a href="/">Home</a></li>
<li><a href="/plans/"><b>Plans &amp; Signup</b></a></li> <li><a href="/plans"><b>Plans &amp; Signup</b></a></li>
<li><a href="/repo/all/">Repositories</a></li> <li><a href="/repo/all">Repositories</a></li>
<li><a href="/news/">News</a></li> <li><a href="/news">News</a></li>
<li><a href="/help/">Help</a></li> <li><a href="/help">Help</a></li>
<li><a href="/account/signin/">Login</a></li> <li><a href="/account/signin/">Login</a></li>
</ul> </ul>
</div> </div>
@ -112,12 +129,14 @@
<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" src="http://bitbucket-assets.s3.amazonaws.com/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
<script type="text/javascript"> <script type="text/javascript">
var date = new Date(); var date = new Date();
date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000)); date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
var cookieoptions = { path: '/', expires: date }; var cookieoptions = { path: '/', expires: date };
window._shard = 'fe01 (ID 1)';
$(document).ready(function(){ $(document).ready(function(){
$('#toggle-repo-content').click(function(){ $('#toggle-repo-content').click(function(){
$('#repo-desc-cloneinfo').toggle('fast'); $('#repo-desc-cloneinfo').toggle('fast');
@ -129,22 +148,22 @@
if ($.cookie('toggle_status') == 'hide') { if ($.cookie('toggle_status') == 'hide') {
$.cookie('toggle_status', 'show', cookieoptions); $.cookie('toggle_status', 'show', cookieoptions);
$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)'); $(this).css('background-image','url(http://bitbucket-assets.s3.amazonaws.com/img/repo-toggle-up.png)');
} else { } else {
$.cookie('toggle_status', 'hide', cookieoptions); $.cookie('toggle_status', 'hide', cookieoptions);
$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)'); $(this).css('background-image','url(http://bitbucket-assets.s3.amazonaws.com/img/repo-toggle-down.png)');
} }
}); });
if ($.cookie('toggle_status') == 'hide') { if ($.cookie('toggle_status') == 'hide') {
$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)'); $('#toggle-repo-content').css('background-image','url(http://bitbucket-assets.s3.amazonaws.com/img/repo-toggle-down.png)');
$('#repo-desc-cloneinfo').hide(); $('#repo-desc-cloneinfo').hide();
$('#repo-menu').hide(); $('#repo-menu').hide();
$('#repo-menu-links-mini').show(); $('#repo-menu-links-mini').show();
$('.repo-desc-description').hide(); $('.repo-desc-description').hide();
$('.repo-avatar').css({ width: '16px' }); $('.repo-avatar').css({ width: '16px' });
} else { } else {
$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)'); $('#toggle-repo-content').css('background-image','url(http://bitbucket-assets.s3.amazonaws.com/img/repo-toggle-up.png)');
$('#repo-desc-cloneinfo').show(); $('#repo-desc-cloneinfo').show();
$('#repo-menu').show(); $('#repo-menu').show();
$('#repo-menu-links-mini').hide(); $('#repo-menu-links-mini').hide();
@ -158,29 +177,29 @@
<div id="tabs"> <div id="tabs">
<ul class="ui-tabs-nav"> <ul class="ui-tabs-nav">
<li> <li>
<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a> <a href="/rg3/youtube-dl/overview"><span>Overview</span></a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a> <a href="/rg3/youtube-dl/downloads"><span>Downloads (0)</span></a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/src/"><span>Source</span></a> <a href="/rg3/youtube-dl/src"><span>Source</span></a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a> <a href="/rg3/youtube-dl/changesets"><span>Changesets</span></a>
</li> </li>
<li class="ui-tabs-nav-issues ui-tabs-selected"> <li class="ui-tabs-nav-issues ui-tabs-selected">
<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a> <a href="/rg3/youtube-dl/wiki"><span>Wiki</span></a>
</li> </li>
@ -188,15 +207,15 @@
<li class="ui-tabs-nav-issues"> <li class="ui-tabs-nav-issues">
<a href="/rg3/youtube-dl/issues/?status=new&amp;status=open"><span>Issues (4) &raquo;</span></a> <a href="/rg3/youtube-dl/issues?status=new&amp;status=open"><span>Issues (11) &raquo;</span></a>
<ul> <ul>
<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li> <li><a href="/rg3/youtube-dl/issues?status=new">New issues</a></li>
<li><a href="/rg3/youtube-dl/issues/?status=new&amp;status=open">Open issues</a></li> <li><a href="/rg3/youtube-dl/issues?status=new&amp;status=open">Open issues</a></li>
<li><a href="/rg3/youtube-dl/issues/?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li> <li><a href="/rg3/youtube-dl/issues?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li>
<li><a href="/rg3/youtube-dl/issues/">All 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/query">Advanced query</a></li>
<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li> <li><a href="/rg3/youtube-dl/issues/new">Create new issue</a></li>
</ul> </ul>
</li> </li>
@ -207,11 +226,11 @@
<li class="tabs-right tabs-far-right"> <li class="tabs-right tabs-far-right">
<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a> <a href="/rg3/youtube-dl/descendants"><span>Forks/Queues (8)</span></a>
</li> </li>
<li class="tabs-right"> <li class="tabs-right">
<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a> <a href="/rg3/youtube-dl/zealots"><span>Followers (58)</span></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -220,25 +239,25 @@
<div id="repo-menu-links"> <div id="repo-menu-links">
<ul> <ul>
<li> <li>
<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a> <a href="/rg3/youtube-dl/rss" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a> <a href="/rg3/youtube-dl/atom" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/pull/" class="link-request-pull"> <a href="/rg3/youtube-dl/pull" class="link-request-pull">
pull request pull request
</a> </a>
</li> </li>
<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</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 href="/rg3/youtube-dl/hack" class="link-hack">patch queue</a></li>
<li> <li>
<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a> <a rel="nofollow" href="/rg3/youtube-dl/follow" class="link-follow">follow</a>
</li> </li>
<li><a class="link-download">get source &raquo;</a> <li><a class="link-download">get source &raquo;</a>
@ -246,9 +265,9 @@
<ul> <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/be549f3809e6.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/be549f3809e6.gz" class="compressed">gz</a></li>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.bz2" class="compressed">bz2</a></li>
</ul> </ul>
@ -264,7 +283,7 @@
<ul> <ul>
<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li> <li><a href="/rg3/youtube-dl/src/be549f3809e6">default</a></li>
</ul> </ul>
@ -274,47 +293,57 @@
<ul> <ul>
<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li> <li><a href="/rg3/youtube-dl/src/be549f3809e6">tip</a></li>
<li><a href="/rg3/youtube-dl/src/1d3bca5d5e5d">2010.04.04</a></li>
<li><a href="/rg3/youtube-dl/src/d6f421afc953">2010.04.03</a></li>
<li><a href="/rg3/youtube-dl/src/a40f32f2978a">2010.04.02</a></li>
<li><a href="/rg3/youtube-dl/src/eadec6d49e8a">2010.03.13</a></li>
<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li> <li><a href="/rg3/youtube-dl/src/c69858fd4850">2010.03.07</a></li>
<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li> <li><a href="/rg3/youtube-dl/src/93ff6dceb3da">2010.02.13</a></li>
<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li> <li><a href="/rg3/youtube-dl/src/9ade3c8f7a53">2010.01.19</a></li>
<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li> <li><a href="/rg3/youtube-dl/src/eabc9bc8ab3c">2009.12.26</a></li>
<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li> <li><a href="/rg3/youtube-dl/src/6947c04fb1b4">2009.09.13</a></li>
<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li> <li><a href="/rg3/youtube-dl/src/4597eb63af5c">2009.09.08</a></li>
<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li> <li><a href="/rg3/youtube-dl/src/df8b882d8b39">2009.08.08</a></li>
<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li> <li><a href="/rg3/youtube-dl/src/2793d3270ff9">2009.06.29</a></li>
<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li> <li><a href="/rg3/youtube-dl/src/cfc3202eb7b6">2009.05.30</a></li>
<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li> <li><a href="/rg3/youtube-dl/src/4bc5ac772e8a">2009.05.25</a></li>
<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li> <li><a href="/rg3/youtube-dl/src/3f498fb56291">2009.05.23</a></li>
<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li> <li><a href="/rg3/youtube-dl/src/31198e942e00">2009.05.13</a></li>
<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li> <li><a href="/rg3/youtube-dl/src/1dd3c78e417e">2009.03.28</a></li>
<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li> <li><a href="/rg3/youtube-dl/src/8dc1b312077f">2009.03.03</a></li>
<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li> <li><a href="/rg3/youtube-dl/src/ef03a5f5f333">2009.02.07</a></li>
<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li> <li><a href="/rg3/youtube-dl/src/ee7b97092712">2009.01.31</a></li>
<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li> <li><a href="/rg3/youtube-dl/src/c72929f1680d">2008.11.01</a></li>
<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li> <li><a href="/rg3/youtube-dl/src/846c13fabe78">2008.10.16</a></li>
<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li> <li><a href="/rg3/youtube-dl/src/9636c1843c6f">2008.09.20</a></li>
<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</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> </ul>
</li> </li>
@ -330,28 +359,28 @@
<div id="repo-menu-links-mini" class="right"> <div id="repo-menu-links-mini" class="right">
<ul> <ul>
<li> <li>
<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a> <a href="/rg3/youtube-dl/rss" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a> <a href="/rg3/youtube-dl/atom" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
</li> </li>
<li> <li>
<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a> <a href="/rg3/youtube-dl/pull" class="tooltip noborder link-request-pull" title="Pull request"></a>
</li> </li>
<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></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 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> <li><a class="tooltip noborder link-download" title="Get source"></a>
<ul> <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/be549f3809e6.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/be549f3809e6.gz" class="compressed">gz</a></li>
<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li> <li><a rel="nofollow" href="/rg3/youtube-dl/get/be549f3809e6.bz2" class="compressed">bz2</a></li>
</ul> </ul>
@ -360,7 +389,7 @@
</div> </div>
<h3> <h3>
<a href="/rg3/">rg3</a> / <a href="/rg3">rg3</a> /
<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</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> <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
@ -372,13 +401,16 @@
<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> <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/> <div id="repo-desc-cloneinfo">Clone this repository (size: 255.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-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> <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> <div class="cb"></div>
<a href="#" id="toggle-repo-content"></a> <a href="#" id="toggle-repo-content"></a>
</div> </div>
@ -391,7 +423,7 @@
<div id="wiki-nav-links"> <div id="wiki-nav-links">
<span class="right"> <span class="right">
<nobr> <nobr>
<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small> <small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki</small>
</nobr> </nobr>
</span> </span>
@ -411,7 +443,7 @@
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1> <h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p> <p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2> <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><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>2010.04.04</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>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> <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> <h2 id="usage-instructions">Usage instructions</h2>
@ -445,10 +477,10 @@
</li></ul> </li></ul>
<h2 id="download-it">Download it</h2> <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> <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> <h3 id="httpbitbucketorgrg3youtube-dlraw20100404youtube-dl20100404"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2010.04.04/youtube-dl">2010.04.04</a></h3>
<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980 <ul><li><strong>MD5</strong>: 6c3e2982b5a46ede4fd5d6e6ed280331
</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b </li><li><strong>SHA1</strong>: 2edaa9a95f26bbd1e871314f3fd5e8e87b1bd576
</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe </li><li><strong>SHA256</strong>: 69aa7757feb01c5faf68414a0220bed1e9210900059b1a7d7c7f2c53e788ae26
</li></ul> </li></ul>
<h3 id="output-template">Output template</h3> <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> <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>
@ -459,14 +491,16 @@
</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes. </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>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><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
</li><li><em>ord</em>: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.
</li></ul> </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> <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> <h2 id="authors">Authors</h2>
<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor. <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>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
</li><li>Benjamin Johnson: Google Video InfoExtractor, Photobucket InfoExtractor, Yahoo! Video InfoExtractor, generic InfoExtractor, ideas, patches, etc.
</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><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> </li></ul>
<p>Copyright © 2006-2009 Ricardo Garcia Gonzalez</p> <p>Copyright © 2006-2010 Ricardo Garcia Gonzalez</p>
@ -479,23 +513,15 @@
</div> </div>
<div id="footer-wrapper"> <div id="footer-wrapper">
<div id="footer"> <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/">&copy; 2008-2009</a> <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/">&copy; 2008-2010</a>
| We run <small><b> | We run <small><b>
<a href="http://www.djangoproject.com/">Django 1.1.0</a> / <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://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.selenic.com/mercurial/">Hg 1.3.1</a> /
<a href="http://www.python.org">Python 2.5.2</a> / <a href="http://www.python.org">Python 2.5.2</a> /
r2687 r2890| fe01
</b></small> </b></small>
</div> </div>
</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> </body>
</html> </html>

@ -193,6 +193,7 @@ class FileDownloader(object):
ignoreerrors: Do not stop on download errors. ignoreerrors: Do not stop on download errors.
ratelimit: Download speed limit, in bytes/sec. ratelimit: Download speed limit, in bytes/sec.
nooverwrites: Prevent overwriting files. nooverwrites: Prevent overwriting files.
retries: Number of times to retry for HTTP error 503
continuedl: Try to continue downloads if possible. continuedl: Try to continue downloads if possible.
noprogress: Do not print the progress bar. noprogress: Do not print the progress bar.
""" """
@ -364,6 +365,10 @@ class FileDownloader(object):
"""Report attemtp to resume at given byte.""" """Report attemtp to resume at given byte."""
self.to_stdout(u'[download] Resuming download at byte %s' % resume_len) self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
def report_retry(self, count, retries):
"""Report retry in case of HTTP error 503"""
self.to_stdout(u'[download] Got HTTP error 503. Retrying (attempt %d of %d)...' % (count, retries))
def report_file_already_downloaded(self, file_name): def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded.""" """Report file has already been fully downloaded."""
try: try:
@ -398,6 +403,10 @@ class FileDownloader(object):
print info_dict['title'].encode(preferredencoding(), 'xmlcharrefreplace') print info_dict['title'].encode(preferredencoding(), 'xmlcharrefreplace')
if self.params.get('forceurl', False): if self.params.get('forceurl', False):
print info_dict['url'].encode(preferredencoding(), 'xmlcharrefreplace') print info_dict['url'].encode(preferredencoding(), 'xmlcharrefreplace')
if self.params.get('forcethumbnail', False) and 'thumbnail' in info_dict:
print info_dict['thumbnail'].encode(preferredencoding(), 'xmlcharrefreplace')
if self.params.get('forcedescription', False) and 'description' in info_dict:
print info_dict['description'].encode(preferredencoding(), 'xmlcharrefreplace')
return return
@ -419,7 +428,7 @@ class FileDownloader(object):
return return
try: try:
success = self._do_download(filename, info_dict['url'].encode('utf-8')) success = self._do_download(filename, info_dict['url'].encode('utf-8'), info_dict.get('player_url', None))
except (OSError, IOError), err: except (OSError, IOError), err:
raise UnavailableFormatError raise UnavailableFormatError
except (urllib2.URLError, httplib.HTTPException, socket.error), err: except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@ -471,7 +480,7 @@ class FileDownloader(object):
if info is None: if info is None:
break break
def _download_with_rtmpdump(self, filename, url): def _download_with_rtmpdump(self, filename, url, player_url):
self.report_destination(filename) self.report_destination(filename)
# Check for rtmpdump first # Check for rtmpdump first
@ -484,12 +493,16 @@ class FileDownloader(object):
# Download using rtmpdump. rtmpdump returns exit code 2 when # Download using rtmpdump. rtmpdump returns exit code 2 when
# the connection was interrumpted and resuming appears to be # the connection was interrumpted and resuming appears to be
# possible. This is part of rtmpdump's normal usage, AFAIK. # possible. This is part of rtmpdump's normal usage, AFAIK.
basic_args = ['rtmpdump', '-q', '-r', url, '-o', filename] basic_args = ['rtmpdump', '-q'] + [[], ['-W', player_url]][player_url is not None] + ['-r', url, '-o', filename]
retval = subprocess.call(basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]) retval = subprocess.call(basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)])
while retval == 2 or retval == 1: while retval == 2 or retval == 1:
self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename), skip_eol=True) prevsize = os.path.getsize(filename)
time.sleep(2.0) # This seems to be needed self.to_stdout(u'\r[rtmpdump] %s bytes' % prevsize, skip_eol=True)
time.sleep(5.0) # This seems to be needed
retval = subprocess.call(basic_args + ['-e'] + [[], ['-k', '1']][retval == 1]) retval = subprocess.call(basic_args + ['-e'] + [[], ['-k', '1']][retval == 1])
cursize = os.path.getsize(filename)
if prevsize == cursize and retval == 1:
break
if retval == 0: if retval == 0:
self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename)) self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
return True return True
@ -497,10 +510,10 @@ class FileDownloader(object):
self.trouble('\nERROR: rtmpdump exited with code %d' % retval) self.trouble('\nERROR: rtmpdump exited with code %d' % retval)
return False return False
def _do_download(self, filename, url): def _do_download(self, filename, url, player_url):
# Attempt to download using rtmpdump # Attempt to download using rtmpdump
if url.startswith('rtmp'): if url.startswith('rtmp'):
return self._download_with_rtmpdump(filename, url) return self._download_with_rtmpdump(filename, url, player_url)
stream = None stream = None
open_mode = 'wb' open_mode = 'wb'
@ -519,24 +532,35 @@ class FileDownloader(object):
request.add_header('Range','bytes=%d-' % resume_len) request.add_header('Range','bytes=%d-' % resume_len)
open_mode = 'ab' open_mode = 'ab'
# Establish connection count = 0
try: retries = self.params.get('retries', 0)
data = urllib2.urlopen(request) while True:
except (urllib2.HTTPError, ), err: # Establish connection
if err.code != 416: # 416 is 'Requested range not satisfiable' try:
raise data = urllib2.urlopen(request)
# Unable to resume break
data = urllib2.urlopen(basic_request) except (urllib2.HTTPError, ), err:
content_length = data.info()['Content-Length'] if err.code == 503:
# Retry in case of HTTP error 503
if content_length is not None and long(content_length) == resume_len: count += 1
# Because the file had already been fully downloaded if count <= retries:
self.report_file_already_downloaded(filename) self.report_retry(count, retries)
return True continue
else: if err.code != 416: # 416 is 'Requested range not satisfiable'
# Because the server didn't let us raise
self.report_unable_to_resume() # Unable to resume
open_mode = 'wb' data = urllib2.urlopen(basic_request)
content_length = data.info()['Content-Length']
if content_length is not None and long(content_length) == resume_len:
# Because the file had already been fully downloaded
self.report_file_already_downloaded(filename)
self._num_downloads += 1
return True
else:
# Because the server didn't let us
self.report_unable_to_resume()
open_mode = 'wb'
data_len = data.info().get('Content-length', None) data_len = data.info().get('Content-length', None)
data_len_str = self.format_bytes(data_len) data_len_str = self.format_bytes(data_len)
@ -562,7 +586,10 @@ class FileDownloader(object):
except (OSError, IOError), err: except (OSError, IOError), err:
self.trouble('ERROR: unable to open for writing: %s' % str(err)) self.trouble('ERROR: unable to open for writing: %s' % str(err))
return False return False
stream.write(data_block) try:
stream.write(data_block)
except (IOError, OSError), err:
self.trouble('\nERROR: unable to write data: %s' % str(err))
block_size = self.best_block_size(after - before, data_block_len) block_size = self.best_block_size(after - before, data_block_len)
# Progress message # Progress message
@ -598,6 +625,15 @@ class InfoExtractor(object):
stitle: Simplified title. stitle: Simplified title.
ext: Video filename extension. ext: Video filename extension.
format: Video format. format: Video format.
player_url: SWF Player URL (may be None).
The following fields are optional. Their primary purpose is to allow
youtube-dl to serve as the backend for a video search function, such
as the one in youtube2mp3. They are only used when their respective
forced printing functions are called:
thumbnail: Full URL to a video thumbnail image.
description: One-line video description.
Subclasses of this one should re-define the _real_initialize() and Subclasses of this one should re-define the _real_initialize() and
_real_extract() methods, as well as the suitable() static method. _real_extract() methods, as well as the suitable() static method.
@ -656,6 +692,8 @@ class YoutubeIE(InfoExtractor):
'18': 'mp4', '18': 'mp4',
'22': 'mp4', '22': 'mp4',
'37': 'mp4', '37': 'mp4',
'43': 'webm',
'45': 'webm',
} }
@staticmethod @staticmethod
@ -674,6 +712,10 @@ class YoutubeIE(InfoExtractor):
"""Report attempt to confirm age.""" """Report attempt to confirm age."""
self._downloader.to_stdout(u'[youtube] Confirming age') self._downloader.to_stdout(u'[youtube] Confirming age')
def report_video_webpage_download(self, video_id):
"""Report attempt to download video webpage."""
self._downloader.to_stdout(u'[youtube] %s: Downloading video webpage' % video_id)
def report_video_info_webpage_download(self, video_id): def report_video_info_webpage_download(self, video_id):
"""Report attempt to download video info webpage.""" """Report attempt to download video info webpage."""
self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id) self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
@ -786,10 +828,26 @@ class YoutubeIE(InfoExtractor):
# Extension # Extension
video_extension = self._video_extensions.get(format_param, 'flv') video_extension = self._video_extensions.get(format_param, 'flv')
# Get video webpage
self.report_video_webpage_download(video_id)
request = urllib2.Request('http://www.youtube.com/watch?v=%s&gl=US&hl=en' % video_id, None, std_headers)
try:
video_webpage = urllib2.urlopen(request).read()
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % str(err))
return
# Attempt to extract SWF player URL
mobj = re.search(r'swfConfig.*"(http://.*?watch-.*?\.swf)"', video_webpage)
if mobj is not None:
player_url = mobj.group(1)
else:
player_url = None
# Get video info # Get video info
self.report_video_info_webpage_download(video_id) self.report_video_info_webpage_download(video_id)
for el_type in ['embedded', 'detailpage', 'vevo']: for el_type in ['&el=embedded', '&el=detailpage', '&el=vevo', '']:
video_info_url = ('http://www.youtube.com/get_video_info?&video_id=%s&el=%s&ps=default&eurl=&gl=US&hl=en' video_info_url = ('http://www.youtube.com/get_video_info?&video_id=%s%s&ps=default&eurl=&gl=US&hl=en'
% (video_id, el_type)) % (video_id, el_type))
request = urllib2.Request(video_info_url, None, std_headers) request = urllib2.Request(video_info_url, None, std_headers)
try: try:
@ -842,6 +900,20 @@ class YoutubeIE(InfoExtractor):
simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title) simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
simple_title = simple_title.strip(ur'_') simple_title = simple_title.strip(ur'_')
# thumbnail image
if 'thumbnail_url' not in video_info:
self._downloader.trouble(u'WARNING: unable to extract video thumbnail')
video_thumbnail = ''
else: # don't panic if we can't find it
video_thumbnail = urllib.unquote_plus(video_info['thumbnail_url'][0])
# description
video_description = 'No description available.'
if self._downloader.params.get('forcedescription', False):
mobj = re.search(r'<meta name="description" content="(.*)"(?:\s*/)?>', video_webpage)
if mobj is not None:
video_description = mobj.group(1)
try: try:
# Process video information # Process video information
self._downloader.process_info({ self._downloader.process_info({
@ -852,34 +924,32 @@ class YoutubeIE(InfoExtractor):
'stitle': simple_title, 'stitle': simple_title,
'ext': video_extension.decode('utf-8'), 'ext': video_extension.decode('utf-8'),
'format': (format_param is None and u'NA' or format_param.decode('utf-8')), 'format': (format_param is None and u'NA' or format_param.decode('utf-8')),
'thumbnail': video_thumbnail.decode('utf-8'),
'description': video_description.decode('utf-8'),
'player_url': player_url,
}) })
if all_formats: if all_formats:
if quality_index == len(self._available_formats) - 1: quality_index += 1
if quality_index == len(self._available_formats):
# None left to get # None left to get
return return
else: else:
quality_index += 1
format_param = self._available_formats[quality_index] format_param = self._available_formats[quality_index]
if format_param == None:
return
continue continue
return return
except UnavailableFormatError, err: except UnavailableFormatError, err:
if best_quality or all_formats: if best_quality or all_formats:
if quality_index == len(self._available_formats) - 1: quality_index += 1
if quality_index == len(self._available_formats):
# I don't ever expect this to happen # I don't ever expect this to happen
if not all_formats: if not all_formats:
self._downloader.trouble(u'ERROR: no known formats available for video') self._downloader.trouble(u'ERROR: no known formats available for video')
return return
else: else:
self.report_unavailable_format(video_id, format_param) self.report_unavailable_format(video_id, format_param)
quality_index += 1
format_param = self._available_formats[quality_index] format_param = self._available_formats[quality_index]
if format_param == None:
return
continue continue
else: else:
self._downloader.trouble('ERROR: format not available for video') self._downloader.trouble('ERROR: format not available for video')
@ -1009,6 +1079,7 @@ class MetacafeIE(InfoExtractor):
'stitle': simple_title, 'stitle': simple_title,
'ext': video_extension.decode('utf-8'), 'ext': video_extension.decode('utf-8'),
'format': u'NA', 'format': u'NA',
'player_url': None,
}) })
except UnavailableFormatError: except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video') self._downloader.trouble(u'ERROR: format not available for video')
@ -1080,6 +1151,32 @@ class GoogleIE(InfoExtractor):
video_title = sanitize_title(video_title) video_title = sanitize_title(video_title)
simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title) simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
# Extract video description
mobj = re.search(r'<span id=short-desc-content>([^<]*)</span>', webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video description')
return
video_description = mobj.group(1).decode('utf-8')
if not video_description:
video_description = 'No description available.'
# Extract video thumbnail
if self._downloader.params.get('forcethumbnail', False):
request = urllib2.Request('http://video.google.com/videosearch?q=%s+site:video.google.com&hl=en' % abs(int(video_id)))
try:
webpage = urllib2.urlopen(request).read()
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
return
mobj = re.search(r'<img class=thumbnail-img (?:.* )?src=(http.*)>', webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video thumbnail')
return
video_thumbnail = mobj.group(1)
else: # we need something to pass to process_info
video_thumbnail = ''
try: try:
# Process video information # Process video information
self._downloader.process_info({ self._downloader.process_info({
@ -1090,6 +1187,7 @@ class GoogleIE(InfoExtractor):
'stitle': simple_title, 'stitle': simple_title,
'ext': video_extension.decode('utf-8'), 'ext': video_extension.decode('utf-8'),
'format': u'NA', 'format': u'NA',
'player_url': None,
}) })
except UnavailableFormatError: except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video') self._downloader.trouble(u'ERROR: format not available for video')
@ -1168,6 +1266,7 @@ class PhotobucketIE(InfoExtractor):
'stitle': simple_title, 'stitle': simple_title,
'ext': video_extension.decode('utf-8'), 'ext': video_extension.decode('utf-8'),
'format': u'NA', 'format': u'NA',
'player_url': None,
}) })
except UnavailableFormatError: except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video') self._downloader.trouble(u'ERROR: format not available for video')
@ -1258,6 +1357,21 @@ class YahooIE(InfoExtractor):
return return
video_uploader = mobj.group(1).decode('utf-8') video_uploader = mobj.group(1).decode('utf-8')
# Extract video thumbnail
mobj = re.search(r'<link rel="image_src" href="(.*)" />', webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video thumbnail')
return
video_thumbnail = mobj.group(1).decode('utf-8')
# Extract video description
mobj = re.search(r'<meta name="description" content="(.*)" />', webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video description')
return
video_description = mobj.group(1).decode('utf-8')
if not video_description: video_description = 'No description available.'
# Extract video height and width # Extract video height and width
mobj = re.search(r'<meta name="video_height" content="([0-9]+)" />', webpage) mobj = re.search(r'<meta name="video_height" content="([0-9]+)" />', webpage)
if mobj is None: if mobj is None:
@ -1303,6 +1417,11 @@ class YahooIE(InfoExtractor):
'title': video_title, 'title': video_title,
'stitle': simple_title, 'stitle': simple_title,
'ext': video_extension.decode('utf-8'), 'ext': video_extension.decode('utf-8'),
'thumbnail': video_thumbnail.decode('utf-8'),
'description': video_description,
'thumbnail': video_thumbnail,
'description': video_description,
'player_url': None,
}) })
except UnavailableFormatError: except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video') self._downloader.trouble(u'ERROR: format not available for video')
@ -1398,6 +1517,7 @@ class GenericIE(InfoExtractor):
'stitle': simple_title, 'stitle': simple_title,
'ext': video_extension.decode('utf-8'), 'ext': video_extension.decode('utf-8'),
'format': u'NA', 'format': u'NA',
'player_url': None,
}) })
except UnavailableFormatError: except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video') self._downloader.trouble(u'ERROR: format not available for video')
@ -1494,6 +1614,188 @@ class YoutubeSearchIE(InfoExtractor):
pagenum = pagenum + 1 pagenum = pagenum + 1
class GoogleSearchIE(InfoExtractor):
"""Information Extractor for Google Video search queries."""
_VALID_QUERY = r'gvsearch(\d+|all)?:[\s\S]+'
_TEMPLATE_URL = 'http://video.google.com/videosearch?q=%s+site:video.google.com&start=%s&hl=en'
_VIDEO_INDICATOR = r'videoplay\?docid=([^\&>]+)\&'
_MORE_PAGES_INDICATOR = r'<span>Next</span>'
_google_ie = None
_max_google_results = 1000
def __init__(self, google_ie, downloader=None):
InfoExtractor.__init__(self, downloader)
self._google_ie = google_ie
@staticmethod
def suitable(url):
return (re.match(GoogleSearchIE._VALID_QUERY, url) is not None)
def report_download_page(self, query, pagenum):
"""Report attempt to download playlist page with given number."""
query = query.decode(preferredencoding())
self._downloader.to_stdout(u'[video.google] query "%s": Downloading page %s' % (query, pagenum))
def _real_initialize(self):
self._google_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:]
query = query.encode('utf-8')
if prefix == '':
self._download_n_results(query, 1)
return
elif prefix == 'all':
self._download_n_results(query, self._max_google_results)
return
else:
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_google_results:
self._downloader.to_stderr(u'WARNING: gvsearch returns max %i results (you requested %i)' % (self._max_google_results, n))
n = self._max_google_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 = mobj.group(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._google_ie.extract('http://video.google.com/videoplay?docid=%s' % id)
return
if re.search(self._MORE_PAGES_INDICATOR, page) is None:
for id in video_ids:
self._google_ie.extract('http://video.google.com/videoplay?docid=%s' % id)
return
pagenum = pagenum + 1
class YahooSearchIE(InfoExtractor):
"""Information Extractor for Yahoo! Video search queries."""
_VALID_QUERY = r'yvsearch(\d+|all)?:[\s\S]+'
_TEMPLATE_URL = 'http://video.yahoo.com/search/?p=%s&o=%s'
_VIDEO_INDICATOR = r'href="http://video\.yahoo\.com/watch/([0-9]+/[0-9]+)"'
_MORE_PAGES_INDICATOR = r'\s*Next'
_yahoo_ie = None
_max_yahoo_results = 1000
def __init__(self, yahoo_ie, downloader=None):
InfoExtractor.__init__(self, downloader)
self._yahoo_ie = yahoo_ie
@staticmethod
def suitable(url):
return (re.match(YahooSearchIE._VALID_QUERY, url) is not None)
def report_download_page(self, query, pagenum):
"""Report attempt to download playlist page with given number."""
query = query.decode(preferredencoding())
self._downloader.to_stdout(u'[video.yahoo] query "%s": Downloading page %s' % (query, pagenum))
def _real_initialize(self):
self._yahoo_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:]
query = query.encode('utf-8')
if prefix == '':
self._download_n_results(query, 1)
return
elif prefix == 'all':
self._download_n_results(query, self._max_yahoo_results)
return
else:
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_yahoo_results:
self._downloader.to_stderr(u'WARNING: yvsearch returns max %i results (you requested %i)' % (self._max_yahoo_results, n))
n = self._max_yahoo_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 = mobj.group(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._yahoo_ie.extract('http://video.yahoo.com/watch/%s' % id)
return
if re.search(self._MORE_PAGES_INDICATOR, page) is None:
for id in video_ids:
self._yahoo_ie.extract('http://video.yahoo.com/watch/%s' % id)
return
pagenum = pagenum + 1
class YoutubePlaylistIE(InfoExtractor): class YoutubePlaylistIE(InfoExtractor):
"""Information Extractor for YouTube playlists.""" """Information Extractor for YouTube playlists."""
@ -1686,7 +1988,7 @@ if __name__ == '__main__':
# Parse command line # Parse command line
parser = optparse.OptionParser( parser = optparse.OptionParser(
usage='Usage: %prog [options] url...', usage='Usage: %prog [options] url...',
version='2010.04.04', version='2010.06.06',
conflict_handler='resolve', conflict_handler='resolve',
) )
@ -1700,6 +2002,8 @@ if __name__ == '__main__':
action='store_true', dest='ignoreerrors', help='continue on download errors', default=False) action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
parser.add_option('-r', '--rate-limit', parser.add_option('-r', '--rate-limit',
dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)') dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
parser.add_option('-R', '--retries',
dest='retries', metavar='T', help='number of retries (default is 10)', default=10)
authentication = optparse.OptionGroup(parser, 'Authentication Options') authentication = optparse.OptionGroup(parser, 'Authentication Options')
authentication.add_option('-u', '--username', authentication.add_option('-u', '--username',
@ -1732,6 +2036,10 @@ if __name__ == '__main__':
action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False) action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
verbosity.add_option('-e', '--get-title', verbosity.add_option('-e', '--get-title',
action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False) action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
verbosity.add_option('--get-thumbnail',
action='store_true', dest='getthumbnail', help='simulate, quiet but print thumbnail URL', default=False)
verbosity.add_option('--get-description',
action='store_true', dest='getdescription', help='simulate, quiet but print video description', default=False)
verbosity.add_option('--no-progress', verbosity.add_option('--no-progress',
action='store_true', dest='noprogress', help='do not print progress bar', default=False) action='store_true', dest='noprogress', help='do not print progress bar', default=False)
parser.add_option_group(verbosity) parser.add_option_group(verbosity)
@ -1744,7 +2052,7 @@ if __name__ == '__main__':
filesystem.add_option('-o', '--output', filesystem.add_option('-o', '--output',
dest='outtmpl', metavar='TPL', help='output filename template') dest='outtmpl', metavar='TPL', help='output filename template')
filesystem.add_option('-a', '--batch-file', filesystem.add_option('-a', '--batch-file',
dest='batchfile', metavar='F', help='file containing URLs to download') dest='batchfile', metavar='F', help='file containing URLs to download (\'-\' for stdin)')
filesystem.add_option('-w', '--no-overwrites', filesystem.add_option('-w', '--no-overwrites',
action='store_true', dest='nooverwrites', help='do not overwrite files', default=False) action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
filesystem.add_option('-c', '--continue', filesystem.add_option('-c', '--continue',
@ -1757,7 +2065,11 @@ if __name__ == '__main__':
batchurls = [] batchurls = []
if opts.batchfile is not None: if opts.batchfile is not None:
try: try:
batchurls = open(opts.batchfile, 'r').readlines() if opts.batchfile == '-':
batchfd = sys.stdin
else:
batchfd = open(opts.batchfile, 'r')
batchurls = batchfd.readlines()
batchurls = [x.strip() for x in batchurls] batchurls = [x.strip() for x in batchurls]
batchurls = [x for x in batchurls if len(x) > 0] batchurls = [x for x in batchurls if len(x) > 0]
except IOError: except IOError:
@ -1780,6 +2092,11 @@ if __name__ == '__main__':
if numeric_limit is None: if numeric_limit is None:
parser.error(u'invalid rate limit specified') parser.error(u'invalid rate limit specified')
opts.ratelimit = numeric_limit opts.ratelimit = numeric_limit
if opts.retries is not None:
try:
opts.retries = long(opts.retries)
except (TypeError, ValueError), err:
parser.error(u'invalid retry count specified')
# Information extractors # Information extractors
youtube_ie = YoutubeIE() youtube_ie = YoutubeIE()
@ -1788,8 +2105,10 @@ if __name__ == '__main__':
youtube_user_ie = YoutubeUserIE(youtube_ie) youtube_user_ie = YoutubeUserIE(youtube_ie)
youtube_search_ie = YoutubeSearchIE(youtube_ie) youtube_search_ie = YoutubeSearchIE(youtube_ie)
google_ie = GoogleIE() google_ie = GoogleIE()
google_search_ie = GoogleSearchIE(google_ie)
photobucket_ie = PhotobucketIE() photobucket_ie = PhotobucketIE()
yahoo_ie = YahooIE() yahoo_ie = YahooIE()
yahoo_search_ie = YahooSearchIE(yahoo_ie)
generic_ie = GenericIE() generic_ie = GenericIE()
# File downloader # File downloader
@ -1797,10 +2116,12 @@ if __name__ == '__main__':
'usenetrc': opts.usenetrc, 'usenetrc': opts.usenetrc,
'username': opts.username, 'username': opts.username,
'password': opts.password, 'password': opts.password,
'quiet': (opts.quiet or opts.geturl or opts.gettitle), 'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription),
'forceurl': opts.geturl, 'forceurl': opts.geturl,
'forcetitle': opts.gettitle, 'forcetitle': opts.gettitle,
'simulate': (opts.simulate or opts.geturl or opts.gettitle), 'forcethumbnail': opts.getthumbnail,
'forcedescription': opts.getdescription,
'simulate': (opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription),
'format': opts.format, 'format': opts.format,
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding())) 'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
or (opts.format == '-1' and opts.usetitle and u'%(stitle)s-%(id)s-%(format)s.%(ext)s') or (opts.format == '-1' and opts.usetitle and u'%(stitle)s-%(id)s-%(format)s.%(ext)s')
@ -1812,6 +2133,7 @@ if __name__ == '__main__':
'ignoreerrors': opts.ignoreerrors, 'ignoreerrors': opts.ignoreerrors,
'ratelimit': opts.ratelimit, 'ratelimit': opts.ratelimit,
'nooverwrites': opts.nooverwrites, 'nooverwrites': opts.nooverwrites,
'retries': opts.retries,
'continuedl': opts.continue_dl, 'continuedl': opts.continue_dl,
'noprogress': opts.noprogress, 'noprogress': opts.noprogress,
}) })
@ -1821,8 +2143,10 @@ if __name__ == '__main__':
fd.add_info_extractor(metacafe_ie) fd.add_info_extractor(metacafe_ie)
fd.add_info_extractor(youtube_ie) fd.add_info_extractor(youtube_ie)
fd.add_info_extractor(google_ie) fd.add_info_extractor(google_ie)
fd.add_info_extractor(google_search_ie)
fd.add_info_extractor(photobucket_ie) fd.add_info_extractor(photobucket_ie)
fd.add_info_extractor(yahoo_ie) fd.add_info_extractor(yahoo_ie)
fd.add_info_extractor(yahoo_search_ie)
# This must come last since it's the # This must come last since it's the
# fallback if none of the others work # fallback if none of the others work

@ -1,5 +1,5 @@
Name: youtube-dl Name: youtube-dl
Version: 2010.04.04 Version: 2010.06.06
Release: 1%{?dist} Release: 1%{?dist}
Summary: Small command-line program to download videos from YouTube Summary: Small command-line program to download videos from YouTube
Summary(pl): Tekstowy program do pobierania filmów z youtube.com Summary(pl): Tekstowy program do pobierania filmów z youtube.com
@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
%doc index.html %doc index.html
%changelog %changelog
* Mon Jun 07 2010 Till Maas <opensource@till.name> - 2010.06.06-1
- Update to latest release
* Thu Apr 29 2010 Till Maas <opensource@till.name> - 2010.04.04-1 * Thu Apr 29 2010 Till Maas <opensource@till.name> - 2010.04.04-1
- Update to latest release to fix some download issues RH #582372 - Update to latest release to fix some download issues RH #582372

Loading…
Cancel
Save