Compare commits

...

153 Commits

Author SHA1 Message Date
daa982bc01 release 2011.09.18c: Prefer mp4 over webm 2011-09-17 00:58:44 +02:00
767414a292 Prefer format 18 over 43 2011-09-17 00:58:14 +02:00
7b417b388a Add youtube format 44 2011-09-17 00:51:25 +02:00
44424ceee9 Prefer mp4 over webm - seems to work better for most users 2011-09-17 00:39:51 +02:00
08a5b7f800 Release 2011.09.18b 2011-09-16 22:33:08 +02:00
1cde6f1d52 Prevent youtube IE from taking youtube playlists 2011-09-16 22:31:31 +02:00
2d8acd8039 Fix escapist URL match 2011-09-15 20:25:22 +02:00
67035ede49 Fix progress message when Content-Length is not set 2011-09-15 20:24:21 +02:00
eb6c37da43 Clarified "restart" 2011-09-15 20:10:27 +02:00
2736595628 Do not update if already up-to-date (Closes #166) 2011-09-15 20:09:30 +02:00
7b1a2bbe17 release 2011.09.18 2011-09-15 19:29:16 +02:00
c25303c3d5 Set continue to false again; we need to send to actually send a HEAD request to determine whether we can continue or not 2011-09-15 19:27:21 +02:00
cc025e1226 release 2011.09.17 2011-09-15 19:23:52 +02:00
eca1b76f01 Update README 2011-09-15 19:23:17 +02:00
366cbfb04a Fix _do_download signature 2011-09-15 19:22:18 +02:00
18bb3d1e35 Make --continue the default and provide --no-continue (Closes #119) 2011-09-15 19:12:04 +02:00
10e7194db1 If --continue is not enabled, set resume_len to zero.
This corrects the reporting of download progress (which previously
started at a value greater than zero).
2011-09-15 19:07:53 +02:00
ef357c4bf2 Bump version number 2011-09-15 18:48:29 +02:00
5260e68f64 Add format fallback 2011-09-15 18:47:36 +02:00
6a1ca41e17 Update README 2011-09-15 12:45:56 +02:00
c99dcbd2d6 Merge remote-tracking branch 'rmanola/master' (Closes: #124)
Add option to specify mp3 quality and prevent the video from being deleted
2011-09-15 12:43:27 +02:00
da0db53a75 added option to get the available formats for a video (Closes #106) 2011-09-15 12:20:03 +02:00
c52b01f326 Added ability to download worst quality video file only. (Closes #113) 2011-09-15 12:14:16 +02:00
36597dc40f Updated to stamp extracted audio file with HTTP last modified date. 2011-09-15 12:04:54 +02:00
9b4556c469 New option --skip-download (Closes #162) 2011-09-15 11:36:49 +02:00
f3098c4d8a --list-extractors (Closes #161) 2011-09-15 11:03:29 +02:00
bdb3f7a769 Simplify suitable 2011-09-15 10:06:14 +02:00
afb5b55de6 Proper warning if xml.etree.ElementTree is not available 2011-09-15 09:59:03 +02:00
c23cec29a3 Update LATEST_VERSION (and wait for a script to do it so I do not forget ;) ) 2011-09-14 23:03:01 +02:00
e5b9fac281 Bump version number 2011-09-14 22:55:26 +02:00
08c1d0d3bc Update README 2011-09-14 22:55:09 +02:00
20e91e8375 Add --match-title and --reject-title (Closes #132) 2011-09-14 22:54:51 +02:00
f9c6878714 Support for The Escapist 2011-09-14 22:26:53 +02:00
8c5dc3ad40 Simplify IE index 2011-09-14 21:39:41 +02:00
1d2e86aed9 Decapitalize options in README for consistency with youtube-dl --help 2011-09-14 21:20:23 +02:00
a2f7e3a5bb Clarify usage 2011-09-14 21:19:33 +02:00
f2a3a3522c typo in README 2011-09-14 21:18:22 +02:00
b487ef0833 Fully implement comedycentral downloader 2011-09-14 21:17:05 +02:00
d0922f29a3 Update LATEST_VERSION (oops) 2011-09-14 00:04:46 +02:00
b90bcbe79e Bump version number 2011-09-13 23:58:46 +02:00
8236e85178 s#phihag#rg3 2011-09-13 23:58:31 +02:00
803abae206 Do not claim copyright in README (Closes #157) 2011-09-13 23:54:50 +02:00
50bdd8a9e7 Merge remote-tracking branch 'knagano/master' 2011-09-13 23:50:44 +02:00
34554a7ad4 Merge remote-tracking branch 'CaptainPatate/master' 2011-09-13 23:35:48 +02:00
93e1659586 Bump version number (remove -phihag) 2011-09-13 22:39:20 +02:00
b576abb457 Automatically generate LATEST_VERSION (Closes #16) 2011-09-13 22:29:50 +02:00
f166bccc8f Allow downloading current thedailyshow episode with youtube-dl :tds 2011-09-13 21:51:44 +02:00
5a2ba45e09 Clarify README 2011-09-13 21:51:06 +02:00
e133e1213f README: More bug filing instructions 2011-09-09 08:47:00 +02:00
454d6691d8 Include ERROR: no fmt_url_map or conn information found in video info in FAQ 2011-09-09 08:41:52 +02:00
d793aebaed comedycentral: 1 seems to be the constant correct offset 2011-09-09 08:14:01 +02:00
5991ddfd7a comedycentral: Use media number instead of act number as ID 2011-09-08 18:49:28 +02:00
a88bc6bbd3 Temporarily fix dailyshow+colbertnation media IDs 2011-09-07 23:15:26 +02:00
46c8c43266 Switch around act and episode title (makes -t nicer) 2011-09-07 22:42:33 +02:00
fedf9f3902 Basic comedycentral (The Daily Show) support (Will work as soon as rtmpdump gets fixed) 2011-09-07 22:06:09 +02:00
0f862ea18c comedycentral: include player URL (still broken) 2011-09-07 21:43:19 +02:00
c8e30044b8 Rudimentary support for comedycentral (rtmpdump currently broken) 2011-09-07 21:36:06 +02:00
cec3a53cbd Do not try to re-encode unicode filenames (Closes #13) 2011-09-07 09:35:22 +02:00
6fc5b0bb17 Credit Sören Schulze for myvideo support 2011-09-06 23:58:00 +02:00
9b0a8bc198 myvideo.de support 2011-09-06 23:56:32 +02:00
e5e74ffb97 Fix os.makedirs in Windows 2011-09-06 17:56:05 +02:00
eb99a7ee5f Bump version to 2011.09.06 2011-09-06 17:42:45 +02:00
50891fece7 Use os.makedirs instead of homebrewn pmkdir 2011-09-06 17:32:22 +02:00
ef53099e35 merged pep8_whitespace 2011-09-06 17:19:23 +02:00
FND
c0a10ca8dc fixed PEP8 whitespace issues
mostly vertical whitespace and mixed spaces and tabs
2011-09-05 09:46:56 +02:00
8f88eb1fa7 Update Makefile to new README format 2011-09-04 11:47:58 +02:00
447b1d7170 Added FAQ to README 2011-09-04 11:41:54 +02:00
dbddab2799 Robust error handling in downloading code 2011-09-03 11:32:05 +02:00
802622ac1c Merge remote-tracking branch 'wise86/master' 2011-08-31 21:28:44 +02:00
e0e56865a0 Remove stable from help wording (There will be only one main branch for now) 2011-08-31 21:28:40 +02:00
eb11aaccbb Update bug reporting to this fork, so that vimeo/blip.tv issues are reported at phihag/issues instead of rg3/issues (Closes #5) 2011-08-28 23:44:23 +02:00
d207e7cf88 Update update mechanism (Closes #4) 2011-08-28 23:38:40 +02:00
36cf7bccde Merge remote-tracking branch 'rbrito/prefer-webm' 2011-08-28 23:23:42 +02:00
5fd5ce0838 Add default make target 2011-08-28 23:17:32 +02:00
6ae796b1ee Credit Rogério Brito for Vimeo support 2011-08-28 23:17:18 +02:00
9c3e23fb64 Merge Vimeo support 2011-08-28 22:57:50 +02:00
5f9f2b7396 Update: Write downloaded file without modification (allows hashsums) 2011-08-28 22:10:03 +02:00
4618f3da74 Makefile to recreate README 2011-08-25 00:09:28 +02:00
eb0387a848 Fix stty detection 2011-08-25 00:08:59 +02:00
fe6dc08b79 Merge git://github.com/dbb/youtube-dl 2011-08-24 23:34:09 +02:00
4f2a5e06da Use subprocess to call stty size when COLUMNS is not set 2011-08-24 23:28:30 +02:00
2c8d32de33 merge gvalkov/optparse-refactor (minus stty) 2011-08-24 23:21:55 +02:00
2b70537d7b merge upstream 2011-08-24 23:04:10 +02:00
6a4f0a114d Use stty size to find terminal width if we're on linux and COLUMNS is not exported 2011-08-23 17:03:28 +03:00
5adcaa4385 Refactor main function 2011-08-23 16:48:08 +03:00
51c8e53ffe Set help formatter width to terminal width (prevents wrapping) 2011-08-23 16:42:51 +03:00
4f9f96f646 Option parsing refactoring ; Moved version string to __version__
Brings terser option formatting to youtube-dl:
  from: -u USERNAME, --username USERNAME
  to:   -u, --username USERNAME
2011-08-23 15:53:36 +03:00
5fb3df4aff Move update_self out of __main__ for clarity 2011-08-23 15:37:35 +03:00
7a9054ec79 Fix small indentation inconsistencies 2011-08-23 15:01:51 +03:00
2770590d5a Use module metadata variables instead of comments 2011-08-23 14:58:22 +03:00
e9cb9c2811 Add vim modeline 2011-08-23 14:45:26 +03:00
1cab2c6dcf Fix blip.tv regular expression to not match blipXtv 2011-08-18 09:31:36 +02:00
86e709d3de Fix youtu.be links (Closes #142) 2011-08-07 13:01:09 +02:00
8519c32d25 Use parse_qs instead of homebrewn parsing 2011-08-07 00:29:25 +02:00
f3dc18d874 youtube: Better error messages 2011-08-07 00:02:50 +02:00
1293ce58ac Fix Python 2.4 compatibility 2011-08-06 12:16:07 +02:00
0a3c8b6291 Use alternative imports for Python 2.4 (Closes #138) 2011-08-06 11:48:45 +02:00
134cff47ab Remove debugging information 2011-08-06 11:20:28 +02:00
f137bef973 Fix RTMP streams and ignore url-less entries 2011-08-06 11:05:57 +02:00
2bf94b3116 Remove horizontal rules from README.md 2011-08-05 19:15:57 -04:00
6bcd846b52 Add README.md (markdown file) 2011-08-05 19:14:13 -04:00
2fb47e073a Merge https://github.com/rg3/youtube-dl into vimeo 2011-08-04 17:44:49 -03:00
05b4029662 Merge https://github.com/rg3/youtube-dl into prefer-webm 2011-08-04 17:44:33 -03:00
33d507f1fe Bump version number 2011-08-04 19:15:14 +02:00
c44b9ee95e Update User-Agent string 2011-08-04 19:14:19 +02:00
8126094cf1 Fix YouTube downloads (code by Philipp Hagemeister) 2011-08-04 19:13:02 +02:00
0ac22e4f5a Fix youtube downloads (Closes #135) 2011-08-04 00:04:55 +02:00
c31b124d7a Suppport for youtube video streams (Mentioned in #108) 2011-07-31 18:09:53 +02:00
47b8dab29e Removed inaccurate warning 2011-07-22 15:28:42 +02:00
91e6a3855b Be lenient about download URLs (Closes #108) 2011-07-18 19:43:21 +02:00
5623100e43 remove debugging code 2011-07-10 23:41:19 +02:00
6eb08fbf8b + --write-info-json 2011-07-10 21:39:36 +02:00
437d76c19a blip.tv support for python 2.5 with trivialjson 2011-07-10 17:31:54 +02:00
2152ee8601 Update youtube playlist for use playlist?list=id format 2011-07-09 14:05:36 +00:00
a1cab7cead call increment_downloads in blip.tv extractor 2011-07-07 14:10:25 +02:00
8b95c38707 --writedescription option 2011-07-07 12:47:36 +02:00
c6b55a8d48 Full youtube video descriptions, including special characters (2.6+, with fallback for older Pythons) 2011-07-07 12:12:20 +02:00
aded78d9e2 Support for blip.tv/file URLs 2011-06-25 19:26:29 +02:00
7745f5d881 Basic blip.tv support 2011-06-21 22:24:58 +02:00
18b7f87409 Added option to allow different audio encoding qualities and to allow specify whether erase or not the video when it's need to extract the audio. 2011-06-06 17:46:37 -07:00
62a29bbf7b Fixed download from Dailymotion.
Fetches FLV URL from "sdURL" in addVariable("sequence") JSON,
instead of addVariable("video") which doesnot exist today.
Supports new title, uploader nickname format.
2011-05-07 22:53:37 +09:00
2fc31a4872 vimeo: Apparently, all videos in vimeo are served in ISO containers. 2011-04-20 21:29:29 -03:00
44c636df89 vimeo: Tweak the regexp to allow some extended URLs from vimeo.
This, in particular, lets me grab the videos from the beginners channel with
URLs like:

    http://vimeo.com/groups/fivebyfive/videos/22648611

Note that the regexp *will* break for other URLs that we don't know about
and that's on purpose: we don't want to accidentally grab videos that would
be passed on to other information extractors.
2011-04-20 21:21:01 -03:00
1e055db69c vimeo: Ignore if we are using HTTP/S or not. 2011-04-20 21:15:57 -03:00
0ecedbdb03 vimeo: Remove clutter in some messages.
We should make a unified way of printing messages, but let's follow suit and
do what the main YoutubeIE does here.
2011-04-20 21:08:01 -03:00
43c0a396a2 Merge branch 'master' into prefer-webm 2011-04-20 21:01:31 -03:00
00f3977f77 Merge branch 'master' into vimeo 2011-04-20 21:00:46 -03:00
e26005adea Deletes duplicate entry in process_info dictionary of YahooIE 2011-04-07 23:25:47 +02:00
4b0d9eed45 Bump version number 2011-03-29 20:32:07 +02:00
3efa45c3a2 Fix upload date regexp (closes #93) 2011-03-15 20:12:10 +01:00
2727dbf78d Split a couple of lines to make the code more readable 2011-03-15 20:04:20 +01:00
e3f7e05c27 Avoid crash reported in issue #86 2011-03-15 20:03:52 +01:00
da54ed4412 Support youtube.com/e/ URLs (closes #88) 2011-02-28 19:37:58 +01:00
d8edbf3a93 Merge branch 'master' into vimeo 2011-02-26 10:09:36 -03:00
a62db07f58 Merge branch 'master' into prefer-webm 2011-02-26 10:09:18 -03:00
b58faab5e7 Bump version number 2011-02-26 00:47:29 +01:00
854cad639e Merge branch 'master' into prefer-webm 2011-02-25 20:08:33 -03:00
cb25a0e30c Merge branch 'master' into vimeo 2011-02-25 20:08:12 -03:00
377086af3d Use '--' to separate the file argument from the options when calling ffmpeg
This is to avoid a potential issue if the file name begins with a hyphen since ffmpeg will interpret it as an option
2011-02-25 23:24:58 +02:00
3b84a43076 Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm 2011-02-21 21:59:23 -03:00
2c8bedd12c Merge branch 'master' into prefer-webm 2011-02-21 21:59:08 -03:00
1a3fe4212f Merge branch 'vimeo' of ssh://github.com/rbrito/youtube-dl into vimeo 2011-02-21 21:52:48 -03:00
c4cfbdf5a5 Merge branch 'master' into vimeo 2011-02-21 21:51:33 -03:00
a4a590b5b1 Merge branch 'master' into prefer-webm 2011-02-17 09:19:12 -02:00
7f69fd3b39 Merge branch 'master' into vimeo 2011-02-17 09:17:30 -02:00
a7e5259c33 vimeo: Make regexp more robust.
This change makes the VimeoIE work with http://player.vimeo.com/video/19267888
2011-02-17 08:25:45 -02:00
8cc98b2358 vimeo: Also accept URLs prefixed by www.
I hope that this doesn't break anything. `:)`
2011-02-04 06:15:27 -02:00
f24c674b04 Make some of the comments more descriptive. 2011-02-04 04:02:29 -02:00
58b53721af Merge branch 'master' into vimeo 2011-02-04 03:51:16 -02:00
c5a088d341 Use non-greedy regexps, for safety.
Since I was very lazy when I coded this, I took the fastest route.  Luckily,
Vasyl' Vavrychuk pointed this out and I went (after many months) and just
did some minor changes.
2011-01-29 04:13:54 -02:00
92743d423a Preliminary downloading from vimeo 2011-01-29 03:59:18 -02:00
9e1ee3364a Merge branch 'master' into prefer-webm 2011-01-29 03:45:21 -02:00
e0edf1e041 Give preference to WebM formats.
This patch gives preference to formats that are Free.
2011-01-29 03:41:44 -02:00
4 changed files with 1470 additions and 511 deletions

View File

@ -1 +1 @@
2011.02.25b
2011.09.18c

20
Makefile Normal file
View 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

118
README.md Normal file
View File

@ -0,0 +1,118 @@
# 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
-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 dump cookie jar to
--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" 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).

1829
youtube-dl

File diff suppressed because it is too large Load Diff