Compare commits

..

251 Commits

Author SHA1 Message Date
Philipp Hagemeister
c4105fa035 release 2012.02.26 2012-02-27 00:42:26 +01:00
Philipp Hagemeister
871dbd3c92 Output RTMP command line if verbose is set 2012-02-27 00:41:53 +01:00
Philipp Hagemeister
c9ed14e6d6 Move imports to top (Closes #283) 2012-02-26 23:53:56 +01:00
Philipp Hagemeister
1ad85e5061 Set default continue behavior to true, no breakage observed in the wild 2012-02-26 23:44:32 +01:00
Philipp Hagemeister
09fbc6c952 verbose flag, and output proxies if it is set 2012-02-26 23:33:19 +01:00
Philipp Hagemeister
895ec266bb Merge pull request #292 from rbrito/fixes/vimeo-ie
VimeoIE: Allow matches taken from embedded videos.
2012-02-26 14:25:12 -08:00
Rogério Brito
d85448f3bb VimeoIE: Allow matches taken from embedded videos.
With this change, I can directly cut and paste URLs embedded in 3rd-party
pages as `youtube-dl`'s arguments.

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
2012-02-24 07:12:21 -02:00
Philipp Hagemeister
99d46e8c27 Merge pull request #275 from grawity/winnt-unicode
Support Unicode in file names on Windows NT
2012-01-16 03:23:22 -08:00
Mantas Mikulėnas
4afdff39d7 Support Unicode in file names on Windows NT 2012-01-16 12:08:01 +02:00
Philipp Hagemeister
661a807c65 Release 2012.01.08b 2012-01-08 17:23:10 +01:00
Philipp Hagemeister
6d58c4546e correct to_screen prints 2012-01-08 17:22:48 +01:00
Philipp Hagemeister
38ffbc0222 Release 2012.01.08 2012-01-08 17:20:55 +01:00
Philipp Hagemeister
fefb166c52 Leave out characters the filesystem cannot encode (Closes: #264) 2012-01-08 17:20:18 +01:00
Philipp Hagemeister
dcb3c22e0b MTV IE 2012-01-07 01:30:30 +01:00
Philipp Hagemeister
47a53c9e46 release 2012.01.05 2012-01-05 11:08:50 +01:00
Philipp Hagemeister
1413cd87eb Correct distinction between unicode and bytes (Closes: #257) 2012-01-05 10:46:21 +01:00
Philipp Hagemeister
c92e184f75 Correct comedycentral flash URL regex 2012-01-05 00:39:47 +01:00
Philipp Hagemeister
3906e6ce60 correct epydoc 2012-01-05 00:36:47 +01:00
Philipp Hagemeister
c7d3c3db0d Fix tds RTMP url extraction 2012-01-04 14:08:17 +01:00
Philipp Hagemeister
d6639d05c2 release 2011.12.18 2011-12-17 01:35:05 +01:00
Philipp Hagemeister
633cf7cbad Add wav audio output 2011-12-17 01:32:28 +01:00
Philipp Hagemeister
a5647b79ce Only skip download if files exists; convert audio 2011-12-16 23:33:46 +01:00
Philipp Hagemeister
ba5059dd66 Release 2011.12.15 2011-12-15 20:32:37 +01:00
Philipp Hagemeister
bb8abbbbae Dailymotion: Use og:title instead of <title> to find title (Closes: #253) 2011-12-15 20:32:05 +01:00
Philipp Hagemeister
561504fffa Release 2011.12.08 2011-12-08 21:39:13 +01:00
Philipp Hagemeister
23e6b8adc8 --prefer-free-formats (Closes #231) 2011-12-08 21:38:28 +01:00
Philipp Hagemeister
3e0ea7d07a m4a: aac in mp4 container (Closes #240) 2011-12-08 21:21:25 +01:00
Philipp Hagemeister
94fd3201b2 Abort when --max-downloads is reached. 2011-12-08 20:59:02 +01:00
Philipp Hagemeister
0b3f3e1ad9 Merge pull request #245 from rbrito/fix-makefile
Makefile: Don't use `echo`'s `-e` option for portability.
2011-12-08 11:39:56 -08:00
Philipp Hagemeister
a05d2a0c05 Merge branch 'master' of github.com:rg3/youtube-dl 2011-12-08 20:39:22 +01:00
Philipp Hagemeister
0b14e0b367 OpenClassRoom IE (Closes: #234) 2011-12-08 20:36:00 +01:00
Rogério Brito
66e8777769 Makefile: Don't use echo's -e option for portability.
Many systems (including Debian, Ubuntu and derivatives like Linux Mint) use
Dash as a noninteractive version of `/bin/sh`, invoked by `make`.

Dash's `echo` command doesn't understand the `-e` option and this generates
spurious output when running `make`.  See [a bugreport][0] for one of the
many instances of this bug/feature in action.

[0]: https://bugs.launchpad.net/ubuntu/+source/dash/+bug/72167
2011-12-08 13:18:29 -02:00
Philipp Hagemeister
348486ced4 Merge pull request #238 from rbrito/add-to-gitignore
Add list of files to ignore for `youtube-dl`.
2011-11-30 11:45:17 -08:00
Rogério Brito
f1f300e629 Add list of files to ignore for youtube-dl. 2011-11-30 14:17:20 -02:00
Philipp Hagemeister
dd17922afc OpenClassRoom videos (#234) 2011-11-30 10:52:04 +01:00
Philipp Hagemeister
40fd4cb86a Move merged code to dev version 2011-11-30 10:00:36 +01:00
Philipp Hagemeister
9e9b75ae4d Merge pull request #236 from lra/dailymotion-fix
Fix the DailymotionIE to parse the new title of a webpage
2011-11-30 00:57:09 -08:00
Laurent Raufaste
8abf76ddb9 Fix the DailymotionIE to parse the new title of a webpage 2011-11-29 22:30:42 -05:00
Philipp Hagemeister
c95da745bc Mention -o - in doc (Closes #204) 2011-11-29 20:22:27 +01:00
Philipp Hagemeister
0cd235eef6 Use freedesktop.org mandated user config file location (Suggested by Tyll in #231) 2011-11-29 20:13:13 +01:00
Philipp Hagemeister
77315556f1 Do not count unmatched or skipped videos towards max-downloads (Closes #232) 2011-11-29 20:08:01 +01:00
Philipp Hagemeister
c379c181e0 Preliminary implementation of configuration files 2011-11-28 01:29:46 +01:00
Philipp Hagemeister
31a2ec2d88 Document -o %(upload_date)s (Closes #228) 2011-11-28 01:00:01 +01:00
Philipp Hagemeister
b88a52504e --max-downloads option (Closes #230) 2011-11-28 00:55:44 +01:00
Philipp Hagemeister
a95567af99 Credit shizeeg for Mixcloud IE 2011-11-24 18:58:19 +01:00
Philipp Hagemeister
849edab8ec Move MixcloudIE to __init__.py 2011-11-24 18:02:12 +01:00
sh!zeeg
b158a1d946 Mixcloud IE 2011-11-24 20:45:14 +04:00
Philipp Hagemeister
fa2672f9fc Release 2011.11.23 2011-11-23 10:36:52 +01:00
Philipp Hagemeister
28e3614bc0 Fix vimeo error (Closes #224) 2011-11-23 10:35:55 +01:00
Philipp Hagemeister
208e095f72 Correct simplify_title call in ComedyCentral IE 2011-11-22 21:26:38 +01:00
Philipp Hagemeister
0ae7abe57c Release 2011.11.22 2011-11-22 15:32:53 +01:00
Philipp Hagemeister
dc0a294a73 Make exception handling 2.5-compatible (Closes #223) 2011-11-22 15:31:30 +01:00
Philipp Hagemeister
468c99257c Release 2011.11.21 2011-11-21 21:51:24 +01:00
Philipp Hagemeister
af8e8d63f9 Allow non-ASCII characters in simplified titles(Closes #220) 2011-11-21 21:50:39 +01:00
Philipp Hagemeister
e092418d8b Simplify simplify_title 2011-11-21 20:17:07 +01:00
Philipp Hagemeister
e33e3045c6 First tests 2011-11-21 20:07:24 +01:00
Philipp Hagemeister
cb6568bf21 Use the dev version in Makefile 2011-11-21 20:00:54 +01:00
Philipp Hagemeister
235b3ba479 Move code into a separate Python module 2011-11-21 19:59:59 +01:00
Philipp Hagemeister
5b3330e0cf Remove empty real_initialize defs 2011-11-21 19:31:20 +01:00
Philipp Hagemeister
aab771fbdf Credit authors of Soundclound and InfoQ extractors 2011-11-16 09:33:03 +01:00
Philipp Hagemeister
00f95a93f5 InfoQ IE (Closes #216) 2011-11-15 23:00:31 +01:00
Philipp Hagemeister
1724e7c461 Merge remote-tracking branch 'ngokevin/soundcloud' 2011-11-15 22:37:49 +01:00
Ori Avtalion
3b98a5ddac InfoQ IE 2011-11-15 23:20:29 +02:00
Philipp Hagemeister
8b59cc93d5 Merge pull request #211 from techtonik/patch-1
Fix duplicated downloads from YouTube user page where watch URLs are not. Thanks to anatoly techtonik.
2011-11-15 01:39:17 -08:00
Philipp Hagemeister
c3e4e7c182 Fix youtube playlist IE match (Closes: #210) 2011-11-15 10:35:59 +01:00
Kevin Ngo
38348005b3 removed weird indent 2011-11-12 17:28:26 -08:00
Kevin Ngo
208c4b9128 added whitespace below soundcloudIE class 2011-11-12 17:10:21 -08:00
Kevin Ngo
ec574c2c41 extracts full title from source 2011-11-12 17:08:40 -08:00
Kevin Ngo
871be928a8 now downloads soundcloud songs, need to polish title grabbing and file naming 2011-11-12 16:48:43 -08:00
Kevin Ngo
b20d4f8626 changed spaces to tabs (by yt-dl standards), fixed bugs, but still won't download. need to figure out how the whole process works to integrate correctly 2011-11-10 01:04:33 -08:00
Kevin Ngo
073d7a5985 extracted all of the soundcloud information including description (not tested), need to hook into filedownloader 2011-11-09 01:52:36 -08:00
Kevin Ngo
40306424b1 work on soundcloud information extractor...need to talk to youtube-dl guys 2011-11-08 00:03:35 -08:00
Kevin Ngo
ecb3bfe543 going home and need to upload what little i did 2011-11-07 18:02:10 -08:00
anatoly techtonik
abeac45abe Fix duplicated downloads from YouTube user page where watch URLs are not always end with &. Stop scan on closing bracker prevents regexp to capture two links instead of one. 2011-11-06 16:42:43 +03:00
Philipp Hagemeister
0fca93ac60 Merge pull request #206 from rbrito/fixes/facebook-ie-2
FacebookIE: Fix regexp to recognize videos that weren't considered.
2011-11-02 10:56:18 -07:00
Rogério Brito
857e5f329a FacebookIE: Fix regexp to recognize videos that weren't considered. 2011-11-01 12:07:05 -02:00
Rogério Brito
053419cd24 FacebookIE: The date doesn't seem to be available anymore.
The current regular expression is likely to match a lot of stuff, as each
comment that a video has has one of those and it is not clear which one is
the date of the video *upload* itself.
2011-10-20 20:28:34 -02:00
Rogério Brito
99e207bab0 FacebookIE: Fix extraction of title as Facebook has changed stuff. 2011-10-20 20:27:48 -02:00
Rogério Brito
0067bbe7a7 FacebookIE: Not all videos are available in all formats. 2011-10-20 20:26:42 -02:00
Philipp Hagemeister
45aa690868 Release 2011.10.19 2011-10-19 00:40:13 +02:00
Philipp Hagemeister
beb245e92f Merge branch 'vimeo' of https://github.com/rbrito/youtube-dl 2011-10-19 00:38:41 +02:00
Rogério Brito
c424df0d2f vimeo: Add the ability to detect if a video is available in HD. (Closes: #194) 2011-10-19 00:37:45 +02:00
Rogério Brito
87929e4b35 vimeo: Add the ability to detect if a video is available in HD. 2011-10-18 19:47:19 -02:00
Philipp Hagemeister
d76736fc5e Merge pull request #195 from rbrito/xvideos
Fixes for the xvideos IE
2011-10-18 13:49:21 -07:00
Rogério Brito
0f9b77223e xvideos: Capture only the video title, not the name of the site. 2011-10-18 18:42:01 -02:00
Rogério Brito
9f47175a40 xvideos: Fix misleading error message when extracting the URL.
We said that we were trying to extract the title of the video.
2011-10-18 18:41:02 -02:00
Rogério Brito
a1a8713aad xvideos: Normalize the URL or it will fail with some inputs.
For instance, if we give it <www.xvideos.com/video1384059>, we would
end up passing that to urllib2, which would complain about an unknown
URL type.
2011-10-18 18:38:17 -02:00
Rogério Brito
6501a06d46 Quick and dirty IE for xvideos.com. 2011-10-13 16:44:20 -03:00
Philipp Hagemeister
8d89fbae5a CollegeHumor IE 2011-10-12 21:13:43 +02:00
Philipp Hagemeister
7a2cf5455c Fix recognition of http://www.youtube.com/course?list=PL41FDABC6AA085E78&category=University/Mathematics/Topology%20%26%20Geometry 2011-10-04 03:25:20 +02:00
Rogério Brito
7125a7ca8b Support "newstyle" Youtube playlist IDs.
Many playlists reported by Youtube now have the form like in:

    http://www.youtube.com/playlist?list=PL520044A3524F5E5D

where `PL` is prefixed to what youtube-dl used to use as playlist IDs. So,
while matching it, we adapt the regular expression so as to discard the `PL`
and only get the `520044A3524F5E5D` in the case of the playlist of the
example.
2011-10-03 21:41:33 -03:00
Philipp Hagemeister
54d47874f7 release 2011.09.30 2011-09-30 09:07:59 +02:00
Philipp Hagemeister
2761012f69 Cosmetic changes to --list-formats 2011-09-30 09:07:36 +02:00
Francois du Toit
3de2a1e635 Added option -L to list available formats 2011-09-28 01:28:37 +02:00
Philipp Hagemeister
1eff9ac0c5 Release 2011.09.27 2011-09-27 21:42:52 +02:00
Philipp Hagemeister
54f329fe93 blip.tv: Handle direct URLs (Thanks to Bahman) 2011-09-27 21:42:15 +02:00
Philipp Hagemeister
9baa2ef53b Update REAMDE.md 2011-09-26 20:29:15 +02:00
Philipp Hagemeister
6bde5972c3 Mention ext in output template help 2011-09-26 20:26:40 +02:00
Philipp Hagemeister
36f6cb369b Add help to output template 2011-09-26 20:24:43 +02:00
Osama Khalid
b845d58b04 Adding HTTPS support for YouTube playlists and users; Escaping dots. 2011-09-25 21:28:20 +03:00
Philipp Hagemeister
efb113c736 Simplify test 2011-09-21 18:49:08 +02:00
Philipp Hagemeister
3ce59dae88 Update README with new options 2011-09-21 18:48:51 +02:00
Philipp Hagemeister
f0b0caa3fa Merge pull request #172 from richardc/master
add support for vorbis to  --extract-audio
2011-09-21 09:47:11 -07:00
Richard Clamp
58384838c3 Add support for vorbis files to --extract-audio
Add Ogg Vorbis as a file type when extracting the audio from a
file.  This can be the 'best' codec if the source clip is a webm
container.
2011-09-21 17:29:25 +01:00
Philipp Hagemeister
abb870d1ad Clarify --cookies option 2011-09-18 18:50:23 +02:00
Philipp Hagemeister
daa982bc01 release 2011.09.18c: Prefer mp4 over webm 2011-09-17 00:58:44 +02:00
Philipp Hagemeister
767414a292 Prefer format 18 over 43 2011-09-17 00:58:14 +02:00
Philipp Hagemeister
7b417b388a Add youtube format 44 2011-09-17 00:51:25 +02:00
Philipp Hagemeister
44424ceee9 Prefer mp4 over webm - seems to work better for most users 2011-09-17 00:39:51 +02:00
Philipp Hagemeister
08a5b7f800 Release 2011.09.18b 2011-09-16 22:33:08 +02:00
Philipp Hagemeister
1cde6f1d52 Prevent youtube IE from taking youtube playlists 2011-09-16 22:31:31 +02:00
Philipp Hagemeister
2d8acd8039 Fix escapist URL match 2011-09-15 20:25:22 +02:00
Philipp Hagemeister
67035ede49 Fix progress message when Content-Length is not set 2011-09-15 20:24:21 +02:00
Philipp Hagemeister
eb6c37da43 Clarified "restart" 2011-09-15 20:10:27 +02:00
Philipp Hagemeister
2736595628 Do not update if already up-to-date (Closes #166) 2011-09-15 20:09:30 +02:00
Philipp Hagemeister
7b1a2bbe17 release 2011.09.18 2011-09-15 19:29:16 +02:00
Philipp Hagemeister
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
Philipp Hagemeister
cc025e1226 release 2011.09.17 2011-09-15 19:23:52 +02:00
Philipp Hagemeister
eca1b76f01 Update README 2011-09-15 19:23:17 +02:00
Philipp Hagemeister
366cbfb04a Fix _do_download signature 2011-09-15 19:22:18 +02:00
Philipp Hagemeister
18bb3d1e35 Make --continue the default and provide --no-continue (Closes #119) 2011-09-15 19:12:04 +02:00
Michael Haggerty
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
Philipp Hagemeister
ef357c4bf2 Bump version number 2011-09-15 18:48:29 +02:00
Philipp Hagemeister
5260e68f64 Add format fallback 2011-09-15 18:47:36 +02:00
Philipp Hagemeister
6a1ca41e17 Update README 2011-09-15 12:45:56 +02:00
Philipp Hagemeister
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
Dominik Heidler
da0db53a75 added option to get the available formats for a video (Closes #106) 2011-09-15 12:20:03 +02:00
Kegan
c52b01f326 Added ability to download worst quality video file only. (Closes #113) 2011-09-15 12:14:16 +02:00
Kegan
36597dc40f Updated to stamp extracted audio file with HTTP last modified date. 2011-09-15 12:04:54 +02:00
Philipp Hagemeister
9b4556c469 New option --skip-download (Closes #162) 2011-09-15 11:36:49 +02:00
Philipp Hagemeister
f3098c4d8a --list-extractors (Closes #161) 2011-09-15 11:03:29 +02:00
Philipp Hagemeister
bdb3f7a769 Simplify suitable 2011-09-15 10:06:14 +02:00
Philipp Hagemeister
afb5b55de6 Proper warning if xml.etree.ElementTree is not available 2011-09-15 09:59:03 +02:00
Philipp Hagemeister
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
Philipp Hagemeister
e5b9fac281 Bump version number 2011-09-14 22:55:26 +02:00
Philipp Hagemeister
08c1d0d3bc Update README 2011-09-14 22:55:09 +02:00
Anand Babu Periasamy
20e91e8375 Add --match-title and --reject-title (Closes #132) 2011-09-14 22:54:51 +02:00
Philipp Hagemeister
f9c6878714 Support for The Escapist 2011-09-14 22:26:53 +02:00
Philipp Hagemeister
8c5dc3ad40 Simplify IE index 2011-09-14 21:39:41 +02:00
Philipp Hagemeister
1d2e86aed9 Decapitalize options in README for consistency with youtube-dl --help 2011-09-14 21:20:23 +02:00
Philipp Hagemeister
a2f7e3a5bb Clarify usage 2011-09-14 21:19:33 +02:00
Philipp Hagemeister
f2a3a3522c typo in README 2011-09-14 21:18:22 +02:00
Philipp Hagemeister
b487ef0833 Fully implement comedycentral downloader 2011-09-14 21:17:05 +02:00
Philipp Hagemeister
d0922f29a3 Update LATEST_VERSION (oops) 2011-09-14 00:04:46 +02:00
Philipp Hagemeister
b90bcbe79e Bump version number 2011-09-13 23:58:46 +02:00
Philipp Hagemeister
8236e85178 s#phihag#rg3 2011-09-13 23:58:31 +02:00
Philipp Hagemeister
803abae206 Do not claim copyright in README (Closes #157) 2011-09-13 23:54:50 +02:00
Philipp Hagemeister
50bdd8a9e7 Merge remote-tracking branch 'knagano/master' 2011-09-13 23:50:44 +02:00
Philipp Hagemeister
34554a7ad4 Merge remote-tracking branch 'CaptainPatate/master' 2011-09-13 23:35:48 +02:00
Philipp Hagemeister
93e1659586 Bump version number (remove -phihag) 2011-09-13 22:39:20 +02:00
Philipp Hagemeister
b576abb457 Automatically generate LATEST_VERSION (Closes #16) 2011-09-13 22:29:50 +02:00
Philipp Hagemeister
f166bccc8f Allow downloading current thedailyshow episode with youtube-dl :tds 2011-09-13 21:51:44 +02:00
Philipp Hagemeister
5a2ba45e09 Clarify README 2011-09-13 21:51:06 +02:00
Philipp Hagemeister
e133e1213f README: More bug filing instructions 2011-09-09 08:47:00 +02:00
Philipp Hagemeister
454d6691d8 Include ERROR: no fmt_url_map or conn information found in video info in FAQ 2011-09-09 08:41:52 +02:00
Philipp Hagemeister
d793aebaed comedycentral: 1 seems to be the constant correct offset 2011-09-09 08:14:01 +02:00
Philipp Hagemeister
5991ddfd7a comedycentral: Use media number instead of act number as ID 2011-09-08 18:49:28 +02:00
Philipp Hagemeister
a88bc6bbd3 Temporarily fix dailyshow+colbertnation media IDs 2011-09-07 23:15:26 +02:00
Philipp Hagemeister
46c8c43266 Switch around act and episode title (makes -t nicer) 2011-09-07 22:42:33 +02:00
Philipp Hagemeister
fedf9f3902 Basic comedycentral (The Daily Show) support (Will work as soon as rtmpdump gets fixed) 2011-09-07 22:06:09 +02:00
Philipp Hagemeister
0f862ea18c comedycentral: include player URL (still broken) 2011-09-07 21:43:19 +02:00
Philipp Hagemeister
c8e30044b8 Rudimentary support for comedycentral (rtmpdump currently broken) 2011-09-07 21:36:06 +02:00
Philipp Hagemeister
cec3a53cbd Do not try to re-encode unicode filenames (Closes #13) 2011-09-07 09:35:22 +02:00
Philipp Hagemeister
6fc5b0bb17 Credit Sören Schulze for myvideo support 2011-09-06 23:58:00 +02:00
Philipp Hagemeister
9b0a8bc198 myvideo.de support 2011-09-06 23:56:32 +02:00
Philipp Hagemeister
e5e74ffb97 Fix os.makedirs in Windows 2011-09-06 17:56:05 +02:00
Philipp Hagemeister
eb99a7ee5f Bump version to 2011.09.06 2011-09-06 17:42:45 +02:00
Philipp Hagemeister
50891fece7 Use os.makedirs instead of homebrewn pmkdir 2011-09-06 17:32:22 +02:00
Philipp Hagemeister
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
Philipp Hagemeister
8f88eb1fa7 Update Makefile to new README format 2011-09-04 11:47:58 +02:00
Philipp Hagemeister
447b1d7170 Added FAQ to README 2011-09-04 11:41:54 +02:00
Philipp Hagemeister
dbddab2799 Robust error handling in downloading code 2011-09-03 11:32:05 +02:00
Philipp Hagemeister
802622ac1c Merge remote-tracking branch 'wise86/master' 2011-08-31 21:28:44 +02:00
Philipp Hagemeister
e0e56865a0 Remove stable from help wording (There will be only one main branch for now) 2011-08-31 21:28:40 +02:00
Philipp Hagemeister
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
Philipp Hagemeister
d207e7cf88 Update update mechanism (Closes #4) 2011-08-28 23:38:40 +02:00
Philipp Hagemeister
36cf7bccde Merge remote-tracking branch 'rbrito/prefer-webm' 2011-08-28 23:23:42 +02:00
Philipp Hagemeister
5fd5ce0838 Add default make target 2011-08-28 23:17:32 +02:00
Philipp Hagemeister
6ae796b1ee Credit Rogério Brito for Vimeo support 2011-08-28 23:17:18 +02:00
Philipp Hagemeister
9c3e23fb64 Merge Vimeo support 2011-08-28 22:57:50 +02:00
Philipp Hagemeister
5f9f2b7396 Update: Write downloaded file without modification (allows hashsums) 2011-08-28 22:10:03 +02:00
Philipp Hagemeister
4618f3da74 Makefile to recreate README 2011-08-25 00:09:28 +02:00
Philipp Hagemeister
eb0387a848 Fix stty detection 2011-08-25 00:08:59 +02:00
Philipp Hagemeister
fe6dc08b79 Merge git://github.com/dbb/youtube-dl 2011-08-24 23:34:09 +02:00
Philipp Hagemeister
4f2a5e06da Use subprocess to call stty size when COLUMNS is not set 2011-08-24 23:28:30 +02:00
Philipp Hagemeister
2c8d32de33 merge gvalkov/optparse-refactor (minus stty) 2011-08-24 23:21:55 +02:00
Philipp Hagemeister
2b70537d7b merge upstream 2011-08-24 23:04:10 +02:00
Georgi Valkov
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
Georgi Valkov
5adcaa4385 Refactor main function 2011-08-23 16:48:08 +03:00
Georgi Valkov
51c8e53ffe Set help formatter width to terminal width (prevents wrapping) 2011-08-23 16:42:51 +03:00
Georgi Valkov
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
Georgi Valkov
5fb3df4aff Move update_self out of __main__ for clarity 2011-08-23 15:37:35 +03:00
Georgi Valkov
7a9054ec79 Fix small indentation inconsistencies 2011-08-23 15:01:51 +03:00
Georgi Valkov
2770590d5a Use module metadata variables instead of comments 2011-08-23 14:58:22 +03:00
Georgi Valkov
e9cb9c2811 Add vim modeline 2011-08-23 14:45:26 +03:00
Philipp Hagemeister
1cab2c6dcf Fix blip.tv regular expression to not match blipXtv 2011-08-18 09:31:36 +02:00
Philipp Hagemeister
86e709d3de Fix youtu.be links (Closes #142) 2011-08-07 13:01:09 +02:00
Philipp Hagemeister
8519c32d25 Use parse_qs instead of homebrewn parsing 2011-08-07 00:29:25 +02:00
Philipp Hagemeister
f3dc18d874 youtube: Better error messages 2011-08-07 00:02:50 +02:00
Philipp Hagemeister
1293ce58ac Fix Python 2.4 compatibility 2011-08-06 12:16:07 +02:00
Philipp Hagemeister
0a3c8b6291 Use alternative imports for Python 2.4 (Closes #138) 2011-08-06 11:48:45 +02:00
Philipp Hagemeister
134cff47ab Remove debugging information 2011-08-06 11:20:28 +02:00
Philipp Hagemeister
f137bef973 Fix RTMP streams and ignore url-less entries 2011-08-06 11:05:57 +02:00
Daniel Bolton
2bf94b3116 Remove horizontal rules from README.md 2011-08-05 19:15:57 -04:00
Daniel Bolton
6bcd846b52 Add README.md (markdown file) 2011-08-05 19:14:13 -04:00
Rogério Brito
2fb47e073a Merge https://github.com/rg3/youtube-dl into vimeo 2011-08-04 17:44:49 -03:00
Rogério Brito
05b4029662 Merge https://github.com/rg3/youtube-dl into prefer-webm 2011-08-04 17:44:33 -03:00
Ricardo Garcia
33d507f1fe Bump version number 2011-08-04 19:15:14 +02:00
Ricardo Garcia
c44b9ee95e Update User-Agent string 2011-08-04 19:14:19 +02:00
Ricardo Garcia
8126094cf1 Fix YouTube downloads (code by Philipp Hagemeister) 2011-08-04 19:13:02 +02:00
Philipp Hagemeister
0ac22e4f5a Fix youtube downloads (Closes #135) 2011-08-04 00:04:55 +02:00
Philipp Hagemeister
c31b124d7a Suppport for youtube video streams (Mentioned in #108) 2011-07-31 18:09:53 +02:00
Philipp Hagemeister
47b8dab29e Removed inaccurate warning 2011-07-22 15:28:42 +02:00
Philipp Hagemeister
91e6a3855b Be lenient about download URLs (Closes #108) 2011-07-18 19:43:21 +02:00
Philipp Hagemeister
5623100e43 remove debugging code 2011-07-10 23:41:19 +02:00
Philipp Hagemeister
6eb08fbf8b + --write-info-json 2011-07-10 21:39:36 +02:00
Philipp Hagemeister
437d76c19a blip.tv support for python 2.5 with trivialjson 2011-07-10 17:31:54 +02:00
Giovanni Visentini
2152ee8601 Update youtube playlist for use playlist?list=id format 2011-07-09 14:05:36 +00:00
Philipp Hagemeister
a1cab7cead call increment_downloads in blip.tv extractor 2011-07-07 14:10:25 +02:00
Philipp Hagemeister
8b95c38707 --writedescription option 2011-07-07 12:47:36 +02:00
Philipp Hagemeister
c6b55a8d48 Full youtube video descriptions, including special characters (2.6+, with fallback for older Pythons) 2011-07-07 12:12:20 +02:00
Philipp Hagemeister
aded78d9e2 Support for blip.tv/file URLs 2011-06-25 19:26:29 +02:00
Philipp Hagemeister
7745f5d881 Basic blip.tv support 2011-06-21 22:24:58 +02:00
rmanola
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
knagano
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
Rogério Brito
2fc31a4872 vimeo: Apparently, all videos in vimeo are served in ISO containers. 2011-04-20 21:29:29 -03:00
Rogério Brito
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
Rogério Brito
1e055db69c vimeo: Ignore if we are using HTTP/S or not. 2011-04-20 21:15:57 -03:00
Rogério Brito
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
Rogério Brito
43c0a396a2 Merge branch 'master' into prefer-webm 2011-04-20 21:01:31 -03:00
Rogério Brito
00f3977f77 Merge branch 'master' into vimeo 2011-04-20 21:00:46 -03:00
Amaury Gauthier
e26005adea Deletes duplicate entry in process_info dictionary of YahooIE 2011-04-07 23:25:47 +02:00
Rogério Brito
d8edbf3a93 Merge branch 'master' into vimeo 2011-02-26 10:09:36 -03:00
Rogério Brito
a62db07f58 Merge branch 'master' into prefer-webm 2011-02-26 10:09:18 -03:00
Rogério Brito
854cad639e Merge branch 'master' into prefer-webm 2011-02-25 20:08:33 -03:00
Rogério Brito
cb25a0e30c Merge branch 'master' into vimeo 2011-02-25 20:08:12 -03:00
Rogério Brito
3b84a43076 Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm 2011-02-21 21:59:23 -03:00
Rogério Brito
2c8bedd12c Merge branch 'master' into prefer-webm 2011-02-21 21:59:08 -03:00
Rogério Brito
1a3fe4212f Merge branch 'vimeo' of ssh://github.com/rbrito/youtube-dl into vimeo 2011-02-21 21:52:48 -03:00
Rogério Brito
c4cfbdf5a5 Merge branch 'master' into vimeo 2011-02-21 21:51:33 -03:00
Rogério Brito
a4a590b5b1 Merge branch 'master' into prefer-webm 2011-02-17 09:19:12 -02:00
Rogério Brito
7f69fd3b39 Merge branch 'master' into vimeo 2011-02-17 09:17:30 -02:00
Rogério Brito
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
Rogério Brito
8cc98b2358 vimeo: Also accept URLs prefixed by www.
I hope that this doesn't break anything. `:)`
2011-02-04 06:15:27 -02:00
Rogério Brito
f24c674b04 Make some of the comments more descriptive. 2011-02-04 04:02:29 -02:00
Rogério Brito
58b53721af Merge branch 'master' into vimeo 2011-02-04 03:51:16 -02:00
Rogério Brito
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
Rogério Brito
92743d423a Preliminary downloading from vimeo 2011-01-29 03:59:18 -02:00
Rogério Brito
9e1ee3364a Merge branch 'master' into prefer-webm 2011-01-29 03:45:21 -02:00
Rogério Brito
e0edf1e041 Give preference to WebM formats.
This patch gives preference to formats that are Free.
2011-01-29 03:41:44 -02:00
9 changed files with 7068 additions and 576 deletions

3
.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
*.pyc
*.pyo
*~

View File

@@ -1 +1 @@
2011.03.29
2012.02.26

23
Makefile Normal file
View File

@@ -0,0 +1,23 @@
default: update
update: compile update-readme update-latest
update-latest:
./youtube-dl.dev --version > LATEST_VERSION
update-readme:
@options=$$(COLUMNS=80 ./youtube-dl.dev --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 >> README.md && \
echo '## OPTIONS' >> README.md && \
echo "$${options}" >> README.md&& \
echo >> README.md && \
echo '## FAQ' >> README.md && \
echo "$${footer}" >> README.md
compile:
cp youtube_dl/__init__.py youtube-dl
.PHONY: default compile update update-latest update-readme

130
README.md Normal file
View File

@@ -0,0 +1,130 @@
# 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
--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)
--max-downloads NUMBER Abort after downloading NUMBER files
### 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,
%(upload_date)s for the upload date (YYYYMMDD), and
%% for a literal percent. Use - to output to
stdout.
-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
-v, --verbose print various debugging information
### Video Format Options:
-f, --format FORMAT video format code
--all-formats download all available video formats
--prefer-free-formats prefer free video formats unless a specific one is
requested
--max-quality FORMAT highest quality format to download
-F, --list-formats list all available formats (currently youtube only)
### 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", "mp3", "m4a", or "wav";
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).

View File

@@ -0,0 +1,6 @@
# source this file in your shell to get a POSIX locale (which will break many programs, but that's kind of the point)
export LC_ALL=POSIX
export LANG=POSIX
export LANGUAGE=POSIX

29
test/test_div.py Normal file
View File

@@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-
# Various small unit tests
import os,sys
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
import youtube_dl
def test_simplify_title():
assert youtube_dl._simplify_title(u'abc') == u'abc'
assert youtube_dl._simplify_title(u'abc_d-e') == u'abc_d-e'
assert youtube_dl._simplify_title(u'123') == u'123'
assert u'/' not in youtube_dl._simplify_title(u'abc/de')
assert u'abc' in youtube_dl._simplify_title(u'abc/de')
assert u'de' in youtube_dl._simplify_title(u'abc/de')
assert u'/' not in youtube_dl._simplify_title(u'abc/de///')
assert u'\\' not in youtube_dl._simplify_title(u'abc\\de')
assert u'abc' in youtube_dl._simplify_title(u'abc\\de')
assert u'de' in youtube_dl._simplify_title(u'abc\\de')
assert youtube_dl._simplify_title(u'ä') == u'ä'
assert youtube_dl._simplify_title(u'кириллица') == u'кириллица'
# Strip underlines
assert youtube_dl._simplify_title(u'\'a_') == u'a'

2785
youtube-dl

File diff suppressed because it is too large Load Diff

6
youtube-dl.dev Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import youtube_dl
youtube_dl.main()

4648
youtube_dl/__init__.py Executable file

File diff suppressed because it is too large Load Diff