Compare commits
	
		
			162 Commits
		
	
	
		
			2011.02.25
			...
			2011.09.27
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					1eff9ac0c5 | ||
| 
						 | 
					54f329fe93 | ||
| 
						 | 
					9baa2ef53b | ||
| 
						 | 
					6bde5972c3 | ||
| 
						 | 
					36f6cb369b | ||
| 
						 | 
					b845d58b04 | ||
| 
						 | 
					efb113c736 | ||
| 
						 | 
					3ce59dae88 | ||
| 
						 | 
					f0b0caa3fa | ||
| 
						 | 
					58384838c3 | ||
| 
						 | 
					abb870d1ad | ||
| 
						 | 
					daa982bc01 | ||
| 
						 | 
					767414a292 | ||
| 
						 | 
					7b417b388a | ||
| 
						 | 
					44424ceee9 | ||
| 
						 | 
					08a5b7f800 | ||
| 
						 | 
					1cde6f1d52 | ||
| 
						 | 
					2d8acd8039 | ||
| 
						 | 
					67035ede49 | ||
| 
						 | 
					eb6c37da43 | ||
| 
						 | 
					2736595628 | ||
| 
						 | 
					7b1a2bbe17 | ||
| 
						 | 
					c25303c3d5 | ||
| 
						 | 
					cc025e1226 | ||
| 
						 | 
					eca1b76f01 | ||
| 
						 | 
					366cbfb04a | ||
| 
						 | 
					18bb3d1e35 | ||
| 
						 | 
					10e7194db1 | ||
| 
						 | 
					ef357c4bf2 | ||
| 
						 | 
					5260e68f64 | ||
| 
						 | 
					6a1ca41e17 | ||
| 
						 | 
					c99dcbd2d6 | ||
| 
						 | 
					da0db53a75 | ||
| 
						 | 
					c52b01f326 | ||
| 
						 | 
					36597dc40f | ||
| 
						 | 
					9b4556c469 | ||
| 
						 | 
					f3098c4d8a | ||
| 
						 | 
					bdb3f7a769 | ||
| 
						 | 
					afb5b55de6 | ||
| 
						 | 
					c23cec29a3 | ||
| 
						 | 
					e5b9fac281 | ||
| 
						 | 
					08c1d0d3bc | ||
| 
						 | 
					20e91e8375 | ||
| 
						 | 
					f9c6878714 | ||
| 
						 | 
					8c5dc3ad40 | ||
| 
						 | 
					1d2e86aed9 | ||
| 
						 | 
					a2f7e3a5bb | ||
| 
						 | 
					f2a3a3522c | ||
| 
						 | 
					b487ef0833 | ||
| 
						 | 
					d0922f29a3 | ||
| 
						 | 
					b90bcbe79e | ||
| 
						 | 
					8236e85178 | ||
| 
						 | 
					803abae206 | ||
| 
						 | 
					50bdd8a9e7 | ||
| 
						 | 
					34554a7ad4 | ||
| 
						 | 
					93e1659586 | ||
| 
						 | 
					b576abb457 | ||
| 
						 | 
					f166bccc8f | ||
| 
						 | 
					5a2ba45e09 | ||
| 
						 | 
					e133e1213f | ||
| 
						 | 
					454d6691d8 | ||
| 
						 | 
					d793aebaed | ||
| 
						 | 
					5991ddfd7a | ||
| 
						 | 
					a88bc6bbd3 | ||
| 
						 | 
					46c8c43266 | ||
| 
						 | 
					fedf9f3902 | ||
| 
						 | 
					0f862ea18c | ||
| 
						 | 
					c8e30044b8 | ||
| 
						 | 
					cec3a53cbd | ||
| 
						 | 
					6fc5b0bb17 | ||
| 
						 | 
					9b0a8bc198 | ||
| 
						 | 
					e5e74ffb97 | ||
| 
						 | 
					eb99a7ee5f | ||
| 
						 | 
					50891fece7 | ||
| 
						 | 
					ef53099e35 | ||
| 
						 | 
					c0a10ca8dc | ||
| 
						 | 
					8f88eb1fa7 | ||
| 
						 | 
					447b1d7170 | ||
| 
						 | 
					dbddab2799 | ||
| 
						 | 
					802622ac1c | ||
| 
						 | 
					e0e56865a0 | ||
| 
						 | 
					eb11aaccbb | ||
| 
						 | 
					d207e7cf88 | ||
| 
						 | 
					36cf7bccde | ||
| 
						 | 
					5fd5ce0838 | ||
| 
						 | 
					6ae796b1ee | ||
| 
						 | 
					9c3e23fb64 | ||
| 
						 | 
					5f9f2b7396 | ||
| 
						 | 
					4618f3da74 | ||
| 
						 | 
					eb0387a848 | ||
| 
						 | 
					fe6dc08b79 | ||
| 
						 | 
					4f2a5e06da | ||
| 
						 | 
					2c8d32de33 | ||
| 
						 | 
					2b70537d7b | ||
| 
						 | 
					6a4f0a114d | ||
| 
						 | 
					5adcaa4385 | ||
| 
						 | 
					51c8e53ffe | ||
| 
						 | 
					4f9f96f646 | ||
| 
						 | 
					5fb3df4aff | ||
| 
						 | 
					7a9054ec79 | ||
| 
						 | 
					2770590d5a | ||
| 
						 | 
					e9cb9c2811 | ||
| 
						 | 
					1cab2c6dcf | ||
| 
						 | 
					86e709d3de | ||
| 
						 | 
					8519c32d25 | ||
| 
						 | 
					f3dc18d874 | ||
| 
						 | 
					1293ce58ac | ||
| 
						 | 
					0a3c8b6291 | ||
| 
						 | 
					134cff47ab | ||
| 
						 | 
					f137bef973 | ||
| 
						 | 
					2bf94b3116 | ||
| 
						 | 
					6bcd846b52 | ||
| 
						 | 
					2fb47e073a | ||
| 
						 | 
					05b4029662 | ||
| 
						 | 
					33d507f1fe | ||
| 
						 | 
					c44b9ee95e | ||
| 
						 | 
					8126094cf1 | ||
| 
						 | 
					0ac22e4f5a | ||
| 
						 | 
					c31b124d7a | ||
| 
						 | 
					47b8dab29e | ||
| 
						 | 
					91e6a3855b | ||
| 
						 | 
					5623100e43 | ||
| 
						 | 
					6eb08fbf8b | ||
| 
						 | 
					437d76c19a | ||
| 
						 | 
					2152ee8601 | ||
| 
						 | 
					a1cab7cead | ||
| 
						 | 
					8b95c38707 | ||
| 
						 | 
					c6b55a8d48 | ||
| 
						 | 
					aded78d9e2 | ||
| 
						 | 
					7745f5d881 | ||
| 
						 | 
					18b7f87409 | ||
| 
						 | 
					62a29bbf7b | ||
| 
						 | 
					2fc31a4872 | ||
| 
						 | 
					44c636df89 | ||
| 
						 | 
					1e055db69c | ||
| 
						 | 
					0ecedbdb03 | ||
| 
						 | 
					43c0a396a2 | ||
| 
						 | 
					00f3977f77 | ||
| 
						 | 
					e26005adea | ||
| 
						 | 
					4b0d9eed45 | ||
| 
						 | 
					3efa45c3a2 | ||
| 
						 | 
					2727dbf78d | ||
| 
						 | 
					e3f7e05c27 | ||
| 
						 | 
					da54ed4412 | ||
| 
						 | 
					d8edbf3a93 | ||
| 
						 | 
					a62db07f58 | ||
| 
						 | 
					854cad639e | ||
| 
						 | 
					cb25a0e30c | ||
| 
						 | 
					3b84a43076 | ||
| 
						 | 
					2c8bedd12c | ||
| 
						 | 
					1a3fe4212f | ||
| 
						 | 
					c4cfbdf5a5 | ||
| 
						 | 
					a4a590b5b1 | ||
| 
						 | 
					7f69fd3b39 | ||
| 
						 | 
					a7e5259c33 | ||
| 
						 | 
					8cc98b2358 | ||
| 
						 | 
					f24c674b04 | ||
| 
						 | 
					58b53721af | ||
| 
						 | 
					c5a088d341 | ||
| 
						 | 
					92743d423a | ||
| 
						 | 
					9e1ee3364a | ||
| 
						 | 
					e0edf1e041 | 
@@ -1 +1 @@
 | 
			
		||||
2011.02.25c
 | 
			
		||||
2011.09.27
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										20
									
								
								Makefile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								Makefile
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,20 @@
 | 
			
		||||
default: update
 | 
			
		||||
 | 
			
		||||
update: update-readme update-latest
 | 
			
		||||
 | 
			
		||||
update-latest:
 | 
			
		||||
	./youtube-dl --version > LATEST_VERSION
 | 
			
		||||
 | 
			
		||||
update-readme:
 | 
			
		||||
	@options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/### \1/') && \
 | 
			
		||||
		header=$$(sed -e '/.*## OPTIONS/,$$ d' README.md) && \
 | 
			
		||||
		footer=$$(sed -e '1,/.*## FAQ/ d' README.md) && \
 | 
			
		||||
		echo "$${header}" > README.md && \
 | 
			
		||||
		echo -e '\n## OPTIONS' >> README.md && \
 | 
			
		||||
		echo "$${options}" >> README.md&& \
 | 
			
		||||
		echo -e '\n## FAQ' >> README.md && \
 | 
			
		||||
		echo "$${footer}" >> README.md
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
.PHONY: default update update-latest update-readme
 | 
			
		||||
							
								
								
									
										122
									
								
								README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										122
									
								
								README.md
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,122 @@
 | 
			
		||||
# youtube-dl
 | 
			
		||||
 | 
			
		||||
## USAGE
 | 
			
		||||
youtube-dl [options] url [url...]
 | 
			
		||||
 | 
			
		||||
## DESCRIPTION
 | 
			
		||||
**youtube-dl** is a small command-line program to download videos from
 | 
			
		||||
YouTube.com and a few more sites. It requires the Python interpreter, version
 | 
			
		||||
2.x (x being at least 5), and it is not platform specific. It should work in
 | 
			
		||||
your Unix box, in Windows or in Mac OS X. It is released to the public domain,
 | 
			
		||||
which means you can modify it, redistribute it or use it however you like.
 | 
			
		||||
 | 
			
		||||
## OPTIONS
 | 
			
		||||
    -h, --help               print this help text and exit
 | 
			
		||||
    -v, --version            print program version and exit
 | 
			
		||||
    -U, --update             update this program to latest version
 | 
			
		||||
    -i, --ignore-errors      continue on download errors
 | 
			
		||||
    -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
 | 
			
		||||
    -R, --retries RETRIES    number of retries (default is 10)
 | 
			
		||||
    --dump-user-agent        display the current browser identification
 | 
			
		||||
    --list-extractors        List all supported extractors and the URLs they
 | 
			
		||||
                             would handle
 | 
			
		||||
 | 
			
		||||
### Video Selection:
 | 
			
		||||
    --playlist-start NUMBER  playlist video to start at (default is 1)
 | 
			
		||||
    --playlist-end NUMBER    playlist video to end at (default is last)
 | 
			
		||||
    --match-title REGEX      download only matching titles (regex or caseless
 | 
			
		||||
                             sub-string)
 | 
			
		||||
    --reject-title REGEX     skip download for matching titles (regex or
 | 
			
		||||
                             caseless sub-string)
 | 
			
		||||
 | 
			
		||||
### Filesystem Options:
 | 
			
		||||
    -t, --title              use title in file name
 | 
			
		||||
    -l, --literal            use literal title in file name
 | 
			
		||||
    -A, --auto-number        number downloaded files starting from 00000
 | 
			
		||||
    -o, --output TEMPLATE    output filename template. Use %(stitle)s to get the
 | 
			
		||||
                             title, %(uploader)s for the uploader name,
 | 
			
		||||
                             %(autonumber)s to get an automatically incremented
 | 
			
		||||
                             number, %(ext)s for the filename extension, and %%
 | 
			
		||||
                             for a literal percent
 | 
			
		||||
    -a, --batch-file FILE    file containing URLs to download ('-' for stdin)
 | 
			
		||||
    -w, --no-overwrites      do not overwrite files
 | 
			
		||||
    -c, --continue           resume partially downloaded files
 | 
			
		||||
    --no-continue            do not resume partially downloaded files (restart
 | 
			
		||||
                             from beginning)
 | 
			
		||||
    --cookies FILE           file to read cookies from and dump cookie jar in
 | 
			
		||||
    --no-part                do not use .part files
 | 
			
		||||
    --no-mtime               do not use the Last-modified header to set the file
 | 
			
		||||
                             modification time
 | 
			
		||||
    --write-description      write video description to a .description file
 | 
			
		||||
    --write-info-json        write video metadata to a .info.json file
 | 
			
		||||
 | 
			
		||||
### Verbosity / Simulation Options:
 | 
			
		||||
    -q, --quiet              activates quiet mode
 | 
			
		||||
    -s, --simulate           do not download the video and do not write anything
 | 
			
		||||
                             to disk
 | 
			
		||||
    --skip-download          do not download the video
 | 
			
		||||
    -g, --get-url            simulate, quiet but print URL
 | 
			
		||||
    -e, --get-title          simulate, quiet but print title
 | 
			
		||||
    --get-thumbnail          simulate, quiet but print thumbnail URL
 | 
			
		||||
    --get-description        simulate, quiet but print video description
 | 
			
		||||
    --get-filename           simulate, quiet but print output filename
 | 
			
		||||
    --get-format             simulate, quiet but print output format
 | 
			
		||||
    --no-progress            do not print progress bar
 | 
			
		||||
    --console-title          display progress in console titlebar
 | 
			
		||||
 | 
			
		||||
### Video Format Options:
 | 
			
		||||
    -f, --format FORMAT      video format code
 | 
			
		||||
    --all-formats            download all available video formats
 | 
			
		||||
    --max-quality FORMAT     highest quality format to download
 | 
			
		||||
 | 
			
		||||
### Authentication Options:
 | 
			
		||||
    -u, --username USERNAME  account username
 | 
			
		||||
    -p, --password PASSWORD  account password
 | 
			
		||||
    -n, --netrc              use .netrc authentication data
 | 
			
		||||
 | 
			
		||||
### Post-processing Options:
 | 
			
		||||
    --extract-audio          convert video files to audio-only files (requires
 | 
			
		||||
                             ffmpeg and ffprobe)
 | 
			
		||||
    --audio-format FORMAT    "best", "aac", "vorbis" or "mp3"; best by default
 | 
			
		||||
    --audio-quality QUALITY  ffmpeg audio bitrate specification, 128k by default
 | 
			
		||||
    -k, --keep-video         keeps the video file on disk after the post-
 | 
			
		||||
                             processing; the video is erased by default
 | 
			
		||||
 | 
			
		||||
## FAQ
 | 
			
		||||
 | 
			
		||||
### Can you please put the -b option back?
 | 
			
		||||
 | 
			
		||||
Most people asking this question are not aware that youtube-dl now defaults to downloading the highest available quality as reported by YouTube, which will be 1080p or 720p in some cases, so you no longer need the -b option. For some specific videos, maybe YouTube does not report them to be available in a specific high quality format you''re interested in. In that case, simply request it with the -f option and youtube-dl will try to download it.
 | 
			
		||||
 | 
			
		||||
### I get HTTP error 402 when trying to download a video. What's this?
 | 
			
		||||
 | 
			
		||||
Apparently YouTube requires you to pass a CAPTCHA test if you download too much. We''re [considering to provide a way to let you solve the CAPTCHA](https://github.com/rg3/youtube-dl/issues/154), but at the moment, your best course of action is pointing a webbrowser to the youtube URL, solving the CAPTCHA, and restart youtube-dl.
 | 
			
		||||
 | 
			
		||||
### I have downloaded a video but how can I play it?
 | 
			
		||||
 | 
			
		||||
Once the video is fully downloaded, use any video player, such as [vlc](http://www.videolan.org) or [mplayer](http://www.mplayerhq.hu/).
 | 
			
		||||
 | 
			
		||||
### The links provided by youtube-dl -g are not working anymore
 | 
			
		||||
 | 
			
		||||
The URLs youtube-dl outputs require the downloader to have the correct cookies. Use the `--cookies` option to write the required cookies into a file, and advise your downloader to read cookies from that file.
 | 
			
		||||
 | 
			
		||||
### ERROR: no fmt_url_map or conn information found in video info
 | 
			
		||||
 | 
			
		||||
youtube has switched to a new video info format in July 2011 which is not supported by old versions of youtube-dl. You can update youtube-dl with `sudo youtube-dl --update`.
 | 
			
		||||
 | 
			
		||||
## COPYRIGHT
 | 
			
		||||
 | 
			
		||||
youtube-dl is released into the public domain by the copyright holders.
 | 
			
		||||
 | 
			
		||||
This README file was originally written by Daniel Bolton (<https://github.com/dbbolton>) and is likewise released into the public domain.
 | 
			
		||||
 | 
			
		||||
## BUGS
 | 
			
		||||
 | 
			
		||||
Bugs and suggestions should be reported at: <https://github.com/rg3/youtube-dl/issues>
 | 
			
		||||
 | 
			
		||||
Please include:
 | 
			
		||||
 | 
			
		||||
* Your exact command line, like `youtube-dl -t "http://www.youtube.com/watch?v=uHlDtZ6Oc3s&feature=channel_video_title"`. A common mistake is not to escape the `&`. Putting URLs in quotes should solve this problem.
 | 
			
		||||
* The output of `youtube-dl --version`
 | 
			
		||||
* The output of `python --version`
 | 
			
		||||
* The name and version of your Operating System ("Ubuntu 11.04 x64" or "Windows 7 x64" is usually enough).
 | 
			
		||||
							
								
								
									
										1870
									
								
								youtube-dl
									
									
									
									
									
								
							
							
						
						
									
										1870
									
								
								youtube-dl
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user