Commit graph

315 commits

Author SHA1 Message Date
Ricardo Garcia f95f29fd25 Properly detect YouTube error messages to print them on screen (fixes issue #172) 2010-10-31 11:28:36 +01:00
Ricardo Garcia 06f34701fe Bump version number 2010-10-31 11:28:33 +01:00
Ricardo Garcia 5ce7d172d7 Restore support for the get_video method, fixing many issues 2010-10-31 11:28:33 +01:00
Ricardo Garcia 2e3a32e4ac Restore proper support for webm formats (fixes issue #166) 2010-10-31 11:28:32 +01:00
Ricardo Garcia 8190e3631b Bump version number 2010-10-31 11:28:29 +01:00
Ricardo Garcia e4db6fd042 Update user agent string 2010-10-31 11:28:29 +01:00
Ricardo Garcia 497cd3e68e Partially rewrite YouTube InfoExtractor after it stopped working
As part of the changes, the program now downloads the highest quality version
by default and uses fmt_url_map to decide which formats are really available.
2010-10-31 11:28:29 +01:00
Ricardo Garcia 460d8acbaa Remove some format command line options 2010-10-31 11:28:29 +01:00
Ricardo Garcia 9bf7fa5213 Do not check for self._downloader being None in several places 2010-10-31 11:28:29 +01:00
Ricardo Garcia 73f4e7afba Rename UnavailableFormatError to UnavailableVideoError 2010-10-31 11:28:29 +01:00
Ricardo Garcia 9715661c19 Use www. instead of uk. in the language setting webpage for YouTube 2010-10-31 11:28:29 +01:00
Ricardo Garcia 14912efbb7 Bump version number 2010-10-31 11:28:25 +01:00
Ricardo Garcia 96942e6224 Modify User-Agent and Accept headers 2010-10-31 11:28:18 +01:00
Ricardo Garcia df372a655f Improve video ordinal assignment method (fixes issue #149) 2010-10-31 11:28:17 +01:00
Ricardo Garcia 9e9647d9a1 Add comment about weird .video extension for format 38 2010-10-31 11:28:17 +01:00
Ricardo Garcia 8da0080d36 Support youtu.be URLs (fixes issue #143) 2010-10-31 11:28:17 +01:00
Ricardo Garcia 57edaa5bac Support the watch_popup syntax in YouTube URLs 2010-10-31 11:28:17 +01:00
Ricardo Garcia 823fcda12a Improve swf player URL detection for RTMP (fixes issue #144) 2010-10-31 11:28:17 +01:00
Ricardo Garcia f2413e6793 Add a --max-quality flag to limit the highest quality (fixes issue #145) 2010-10-31 11:28:17 +01:00
Ricardo Garcia c833bb97dc Add support for "original" format in YouTube (fixes issue #155) 2010-10-31 11:28:17 +01:00
Ricardo Garcia 7e2dd306fe Make the Dailymotion uploader regexp more flexible because it fails sometimes 2010-10-31 11:28:17 +01:00
Ricardo Garcia dea147f78e Remove unused methods from the Dailymotion InfoExtractor 2010-10-31 11:28:17 +01:00
Witold Baryluk 08cf5cb80b Remove dead disclaimer/confirmation code.
I do knot know how to perform age confirmation, so just
removeing it for the time we will know how to do this.
2010-10-31 11:28:17 +01:00
Witold Baryluk 4135fa4585 Add support for the Dailymotion
Based slightly (idea and one regular expression) on the old anonymous
dailymotion-dl.pl, but with fixes (more robust regular expression,
extracting author, support for domains other than .com). Simpler
due to the fact that youtube-dl provides all needed functionalities.
2010-10-31 11:28:17 +01:00
Ricardo Garcia fd8ede223e Include format 43 in best quality list (fixes issue #150) 2010-10-31 11:28:17 +01:00
Ricardo Garcia 2b06c33d19 Improve some metavar names 2010-10-31 11:28:17 +01:00
Ricardo Garcia ca6a11fa59 Forbid forward slash in win32 file names (fixes issue #147) 2010-10-31 11:28:17 +01:00
Ricardo Garcia de3ed1f84a Bump version number 2010-10-31 11:28:13 +01:00
Ricardo Garcia 0b59bf4a5e Add webm extension to formats 43 and 45 (fixes issue #139) 2010-10-31 11:28:10 +01:00
Ricardo Garcia 896a6ea9e2 Fix for all-formats exception by Valentin Hilbig 2010-10-31 11:28:10 +01:00
Ricardo Garcia 7031008c98 Add a number of retries with tweaked patch, originally from Neil Channen 2010-10-31 11:28:03 +01:00
Ricardo Garcia e616ec0ca6 Add player signature verification to rtmpdump support (fixes issue #63) 2010-10-31 11:27:01 +01:00
Ricardo Garcia 2a7353b87a Make -a understand dash means stdin 2010-10-31 11:27:01 +01:00
Ricardo Garcia 787f2a5d95 Also try no "el" option in get_video_info (fixes issue #130) 2010-10-31 11:27:01 +01:00
Ricardo Garcia 42e3546fb5 Increment number of downloads when the file has already been fully downloaded 2010-10-31 11:27:01 +01:00
Ricardo Garcia 0228ee9788 Print EOL before "unable to write data" error 2010-10-31 11:27:01 +01:00
Ricardo Garcia 131efd1ae0 Detect errors in video data writes 2010-10-31 11:27:01 +01:00
Ricardo Garcia 2bebb386b8 Make "all-formats" and "best-quality" download the version without specific format too 2010-10-31 11:27:01 +01:00
Ricardo Garcia 7e58d56888 Merge changes by obeythepenguin 2010-10-31 11:27:01 +01:00
Ricardo Garcia 554bbdc48c Bump version number 2010-10-31 11:26:57 +01:00
Ricardo Garcia 37dfa1e0df Also try el=vevo on YouTube if everything else fails (fixes issue #115) 2010-10-31 11:26:57 +01:00
Ricardo Garcia 4dd63be193 Bump version number 2010-10-31 11:26:53 +01:00
Ricardo Garcia 7d8d06122d Add the "ord" template parameter (fixes issue #101) 2010-10-31 11:26:53 +01:00
Ricardo Garcia 9177ce4d8c Support new playlist style URL (fixes issue #114) 2010-10-31 11:26:52 +01:00
Ricardo Garcia ce5cafea40 Change method to detect end of playlist (fixes issue #113) 2010-10-31 11:26:52 +01:00
Ricardo Garcia ae3fc475eb Bump version number 2010-10-31 11:26:48 +01:00
Ricardo Garcia d063db3810 Try el=detailpage if el=embedded fails for YouTube 2010-10-31 11:26:48 +01:00
Ricardo Garcia 6194531831 Add Yahoo! Video InfoExtractor, merged from "obeythepenguin" 2010-10-31 11:26:48 +01:00
Ricardo Garcia 2ed1ddd0a0 Request video info webpage using "embedded" instead of "detailpage"
In the request for get_video_info, use el=embedded instead of el=detailpage, as
if the request was coming from an embedded video player instead of the video
webpage. This created problems for some videos, with YouTube replying with
"Invalid parameters". This fixes issue #109 and fixes issue #110.
2010-10-31 11:26:48 +01:00
Ricardo Garcia eaf4a7288d Solve minor aesthetical problem in rtmpdump error messages 2010-10-31 11:26:48 +01:00
Ricardo Garcia 6ba562b0e4 Added --all-format option from tweaked patch (fixes issue #102) 2010-10-31 11:26:48 +01:00
Ricardo Garcia 131bc7651a Make the "-" output file name equivalent to /dev/stdout (fixes issue #103) 2010-10-31 11:26:48 +01:00
Ricardo Garcia 5caacaddc6 Bump version number 2010-10-31 11:26:42 +01:00
Ricardo Garcia 79f193e5d8 Do not use the final URL for -g 2010-10-31 11:26:38 +01:00
Ricardo Garcia 44e16fa17f Bump version number 2010-10-31 11:26:34 +01:00
Ricardo Garcia d983524781 Add --no-progress option (fixes issue #98) 2010-10-31 11:26:34 +01:00
Ricardo Garcia 1392f3f52c Give preference to format 34 before format 5 in quality list 2010-10-31 11:26:34 +01:00
Ricardo Garcia 43ab0ca432 Do not error out on problems printing the file name 2010-10-31 11:26:34 +01:00
Ricardo Garcia 31cbdaafd4 Properly support simple titles in the newest InfoExtractors 2010-10-31 11:26:34 +01:00
Ricardo Garcia bd3cdf6dc4 Do not pass URLs around in Unicode form (fixes issue #92) 2010-10-31 11:26:34 +01:00
Ricardo Garcia 8cc468de75 Bump version number 2010-10-31 11:26:31 +01:00
Ricardo Garcia 31bcb48001 Tweak final filename in the open attempt, to be platform and filename-agnostic 2010-10-31 11:26:30 +01:00
Ricardo Garcia c201ebc915 Fix SyntaxError triggered by mistake in user-agent commit 2010-10-31 11:26:30 +01:00
Ricardo Garcia ce9c6a3097 Fix problem with sanitize_title not replacing Windows directory separator 2010-10-31 11:26:30 +01:00
Ricardo Garcia 4cfeb46544 Update user-agent string 2010-10-31 11:26:30 +01:00
Ricardo Garcia 490fd7aea7 Cherry-pick obeythepenguin's changes and merge them into main branch 2010-10-31 11:26:30 +01:00
Ricardo Garcia c05fc6a345 Support simplest new URLs in YouTube 2010-10-31 11:26:30 +01:00
Ricardo Garcia 91bce611c7 Bump version number 2010-10-31 11:26:26 +01:00
Ricardo Garcia 1c1821f8eb Improve rtmpdump support 2010-10-31 11:25:09 +01:00
Ricardo Garcia 60f8049d05 Only verify the URL when it's an HTTP download 2010-10-31 11:25:08 +01:00
obeythepenguin@gmail.com 49c0028a7a patched to add Google Video and Photobucket support 2010-10-31 11:25:08 +01:00
Ricardo Garcia f1b4bee09d Bump version number 2010-10-31 11:25:05 +01:00
Ricardo Garcia a04e80a481 Add flexibility importing the "parse_qs" function (fixes issue #81) 2010-10-31 11:25:05 +01:00
Ricardo Garcia fe788f2c6f Bump version number 2010-10-31 11:25:01 +01:00
Ricardo Garcia 75a4cf3c97 Fix minor problems with Youtube user InfoExtractor 2010-10-31 11:25:01 +01:00
Ricardo Garcia 0487b407a1 Add support for using rtmpdump 2010-10-31 11:25:01 +01:00
Ricardo Garcia a692ca7c49 Bump version number 2010-10-31 11:24:57 +01:00
Ricardo Garcia 9c457d2a20 Handle file open mode correctly (fixes issue #76) 2010-10-31 11:24:56 +01:00
Archanamiya c39c05cdd7 Added support to download all of a user's videos! 2010-10-31 11:24:56 +01:00
Ricardo Garcia 29f0756805 Fix detection of uploader nickname in metacafe (fixes issue #67) 2010-10-31 11:24:56 +01:00
Ricardo Garcia d9bc015b3c Take format 37 into account (fixes issue #65) 2010-10-31 11:24:56 +01:00
Ricardo Garcia 4bec29ef4b Add self-updating code 2010-10-31 11:24:56 +01:00
Ricardo Garcia ab1f697827 Use unquote_plus to decode video title 2010-10-31 11:24:56 +01:00
Ricardo Garcia 583c714fde Allow empty titles because they do appear in some videos (fixes issue #53) 2010-10-31 11:24:56 +01:00
Ricardo Garcia 850ab76560 Use default values for "continuedl" and "nooverwrites" downloader parameters 2010-10-31 11:24:56 +01:00
Ricardo Garcia f5a5bec351 Avoid using Unicode strings when forming URL requests (fixes issue #50) 2010-10-31 11:24:56 +01:00
Ricardo Garcia f94b636c3e Improve preferred encoding detection method 2010-10-31 11:24:56 +01:00
Ricardo Garcia 0833f1eb83 Restore INTERNAL version number 2010-10-31 11:24:56 +01:00
Ricardo Garcia ad0525b3e6 Bump version number 2010-10-31 11:24:52 +01:00
Ricardo Garcia 30edbf89e4 Report final URL with -g and do not print URLs normally (fixes issue #49) 2010-10-31 11:24:52 +01:00
Ricardo Garcia eae2666cb4 Handle weird OSX locale settings gracefully (fixes issue #43) 2010-10-31 11:24:52 +01:00
Ricardo Garcia 2a04438c7c Restore INTERNAL version number 2010-10-31 11:24:52 +01:00
Ricardo Garcia dd24ff44ab Bump version number 2010-10-31 11:24:48 +01:00
Ricardo Garcia 304a4d85ea Modify _MORE_PAGES_INDICATOR for searches (fixes issue #41) 2010-10-31 11:24:48 +01:00
Ricardo Garcia d899774377 Accept my_playlists syntax for playlists 2010-10-31 11:24:48 +01:00
Ricardo Garcia fade05990c Do not specify any format as a last option for the -b flag 2010-10-31 11:24:48 +01:00
Ricardo Garcia e5b1604882 Set INTERNAL version number 2010-10-31 11:24:48 +01:00
Ricardo Garcia 0c8beb43f2 Bump version number 2010-10-31 11:24:44 +01:00
Ricardo Garcia 71b7300e63 Use get_video_info to work around captcha problems (fixes issue #31) 2010-10-31 11:24:44 +01:00
Ricardo Garcia 8497c36d5a Fix minor problem with size formatting method 2010-10-31 11:24:44 +01:00
Ricardo Garcia 110cd3462e Update User-agent string 2010-10-31 11:24:43 +01:00
Ricardo Garcia 18963a36b0 Fix metacafe.com code due to recent changes in the site 2010-10-31 11:24:43 +01:00
Ricardo Garcia df1ceb1fd9 Include format 5 in best quality list 2010-10-31 11:24:43 +01:00
Ricardo Garcia 7eb0e89742 Properly encode messages sent to stderr (fixes issue #34) 2010-10-31 11:24:43 +01:00
Ricardo Garcia 8b07dec5f6 Bump version number 2010-10-31 11:24:40 +01:00
Ricardo Garcia 113e5266cc Modify "more pages" check in YouTube playlist (fixes issue #29) 2010-10-31 11:24:40 +01:00
Ricardo Garcia 55e7c75e12 Delay opening file until there is data to write
Fixes issue #19.
2010-10-31 11:24:40 +01:00
Ricardo Garcia ff21a710ae Restore INTERNAL version number 2010-10-31 11:24:36 +01:00
Ricardo Garcia 7374795552 Bump version number 2010-10-31 11:24:36 +01:00
Ricardo Garcia 0cd61126fc Document new "continuedl" FileDownloader option 2010-10-31 11:24:36 +01:00
Ricardo Garcia e1f18b8a84 Remove integer casts and replace them with long integer casts 2010-10-31 11:24:36 +01:00
Ricardo Garcia 6a0015a7e0 Fix missing cast preventing detection of already downloaded file 2010-10-31 11:24:36 +01:00
Ricardo Garcia 7db85b2c70 Tweaks to ivanov's code 2010-10-31 11:24:36 +01:00
Paul Ivanov f76c2df64e Added -c option (--continue)
interrupted downloads will properly resume and append to the previously downloaded data, instead of overwriting the file.

There's some error checking - if the length of the file to be download matches the length of the previously downloaded data, we report that this file has already been downloaded and do nothing.

If there is some other HTTP 416 'Requested range not satisfiable' error, we simply re-download the whole file (reverting to the original functionality)

All other HTTP errors are simply raised.

Resuming does not override -w (--nooverwrite), since it is not clear what should happen if file on disk is larger than file to be downloaded.

Thus, -c does nothing if -w is present.
2010-10-31 11:24:36 +01:00
Ricardo Garcia daa88ccc2e Fix TypeError when using the -f option (fixes issue #24) 2010-10-31 11:24:36 +01:00
Ricardo Garcia eb5d184157 Restore INTERNAL version number 2010-10-31 11:24:36 +01:00
Ricardo Garcia 5745bfdcdc Bump version number 2010-10-31 11:24:32 +01:00
Ricardo Garcia 320becd692 Remove trails from the "append_const" change (fixes issue #23) 2010-10-31 11:24:32 +01:00
Ricardo Garcia 968aa88438 Only catch UnavailableFormatError in call to process_info 2010-10-31 11:24:32 +01:00
Ricardo Garcia cbfff4db63 Verify URLs in simulate mode (fixes issue #22) 2010-10-31 11:24:32 +01:00
Ricardo Garcia 781daeabdb Restore "INTERNAL" version number 2010-10-31 11:24:32 +01:00
Ricardo Garcia 1d50e3d153 Bump version number 2010-10-31 11:24:19 +01:00
Ricardo Garcia d69a1c9189 Handle "content too short" errors properly 2010-10-31 11:24:19 +01:00
Ricardo Garcia 488f619471 Close video file before removing it. 2010-10-31 11:24:19 +01:00
Ricardo Garcia cab60d710a Put back INTERNAL version 2010-10-31 11:24:19 +01:00
Ricardo Garcia 152edc0d4c Set version number 2010-10-31 11:24:16 +01:00
Ricardo Garcia b74c859d0f Use store_const instead of append_const as the latter requires Python 2.5 2010-10-31 11:24:16 +01:00
Ricardo Garcia 0e54320009 Restore INTERNAL version number 2010-10-31 11:24:16 +01:00
Ricardo Garcia 43f35682e9 Put version number in place 2010-10-31 11:24:12 +01:00
Ricardo Garcia ad274509aa Add an "epoch" keyword to the output template 2010-10-31 11:24:12 +01:00
Ricardo Garcia d09744d055 Add format 35 (flv) as second best in quality 2010-10-31 11:24:12 +01:00
Ricardo Garcia 1c76e23e0f Move the -t and -l options to the filesystem group 2010-10-31 11:24:12 +01:00
dannycolligan 42bcd27d3b Some consistency changes and ghost-file bugfix after discussion with rg3 2010-10-31 11:24:12 +01:00
dannycolligan 2740c509b3 Fixed ambiguity of multiple video option specifiers by dissalowing it; changed some sys.ext calls to parser.error 2010-10-31 11:24:12 +01:00
dannycolligan 7b7759f5a4 Added -b option and created option groups for help prompt 2010-10-31 11:24:12 +01:00
Ricardo Garcia 8d2c83eda5 Update and correct (format,extension) table for YouTube 2010-10-31 11:24:12 +01:00
Ricardo Garcia 2f11508ada Minor documentation change 2010-10-31 11:24:12 +01:00
Ricardo Garcia b65740e474 Skip blank lines in batch file -- fixes issue #9 2010-10-31 11:24:12 +01:00
Ricardo Garcia a825f0ca83 Revert version number to INTERNAL 2010-10-31 11:24:12 +01:00
Ricardo Garcia 27c3383e2d Set version number 2010-10-31 11:24:08 +01:00
Ricardo Garcia dbccb6cd84 Fix code for metacafe.com (this fixes issue #8) 2010-10-31 11:24:08 +01:00
Ricardo Garcia 98164eb3b9 Fix some minor unicode-related problems 2010-10-31 11:24:08 +01:00
Ricardo Garcia 2851b2ca18 Update internal documentation to reflect the new behaviour 2010-10-31 11:24:08 +01:00
Ricardo Garcia 6f21f68629 Download videos after extracting information
This is achieved by letting the InfoExtractors instruct its downloader to
process the information dictionary just after extracting the information. As a
consequence, some code is simplified too.
2010-10-31 11:24:08 +01:00
Ricardo Garcia 147753eb33 Replase self._downloader.to_stderr() with self._downloader.trouble() 2010-10-31 11:24:08 +01:00
Ricardo Garcia 3aaf887e98 Put the downloader in full control of output messages 2010-10-31 11:24:08 +01:00
Ricardo Garcia 9bf386d74b Move the downloader return code to a class member
This makes it possible to initialize it with value zero and later let the
trouble() overwrite the value. It simplifies error treatment and paves the way
for the InfoExtracto objects to call process_info() themselves, which should
solve the issues with tor and some other problems.
2010-10-31 11:24:08 +01:00
Ricardo Garcia 2f4d18a9f7 Use getpreferredencoding() instead of getdefaultlocale()
This fixes issue #7 and is recommended after a bug report I made to the
Python team:

http://bugs.python.org/issue5815
2010-10-31 11:24:08 +01:00
Ricardo Garcia b0eddb2eb4 Update User-Agent string 2010-10-31 11:24:08 +01:00
Ricardo Garcia 9cee6d9035 Minor adjustments to closely match what a web browser does 2010-10-31 11:24:08 +01:00