youtube-dl
11 years agoFix MIT extractor for Python 2.6
Jeff Smith [Wed, 28 Aug 2013 19:00:59 +0000 (14:00 -0500)]
Fix MIT extractor for Python 2.6

The HTML for the MIT page does not parse cleanly for Python 2.6 due
to script tags within an actual script element.  The offending piece
is inside a comment block, so removing all such comment blocks
fixes the parsing.

11 years agorelease 2013.08.28.1
Philipp Hagemeister [Wed, 28 Aug 2013 17:00:17 +0000 (19:00 +0200)]
release 2013.08.28.1

11 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Wed, 28 Aug 2013 16:22:33 +0000 (18:22 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoMerge remote-tracking branch 'rzhxeo/youporn-hd'
Philipp Hagemeister [Wed, 28 Aug 2013 16:22:28 +0000 (18:22 +0200)]
Merge remote-tracking branch 'rzhxeo/youporn-hd'

Conflicts:
youtube_dl/utils.py

11 years agoYoupornIE: Clean up extraction of hd video
rzhxeo [Wed, 28 Aug 2013 14:04:48 +0000 (16:04 +0200)]
YoupornIE: Clean up extraction of hd video

11 years agoLet aes_decrypt_text return bytes instead of unicode
rzhxeo [Wed, 28 Aug 2013 14:03:35 +0000 (16:03 +0200)]
Let aes_decrypt_text return bytes instead of unicode

11 years agoFix division bug in aes.py
rzhxeo [Wed, 28 Aug 2013 14:01:43 +0000 (16:01 +0200)]
Fix division bug in aes.py

11 years agoAdd intlist_to_bytes to utils.py
rzhxeo [Wed, 28 Aug 2013 13:59:07 +0000 (15:59 +0200)]
Add intlist_to_bytes to utils.py

11 years agoMerge pull request #1 from phihag/youporn-hd-pr
rzhxeo [Wed, 28 Aug 2013 13:23:33 +0000 (06:23 -0700)]
Merge pull request #1 from phihag/youporn-hd-pr

Allow changes to run under Python 3

11 years agoHide the password and username in verbose mode (closes #1089)
Jaime Marquínez Ferrándiz [Sat, 20 Jul 2013 10:49:24 +0000 (12:49 +0200)]
Hide the password and username in verbose mode (closes #1089)

11 years agoAllow changes to run under Python 3
Philipp Hagemeister [Wed, 28 Aug 2013 12:28:55 +0000 (14:28 +0200)]
Allow changes to run under Python 3

11 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Wed, 28 Aug 2013 12:02:40 +0000 (14:02 +0200)]
Merge remote-tracking branch 'origin/master'

11 years ago[sohu] Handle encoding, and fix tests
Philipp Hagemeister [Wed, 28 Aug 2013 11:59:08 +0000 (13:59 +0200)]
[sohu] Handle encoding, and fix tests

11 years agoPostProcessingError holds the message in the 'msg' property, not in 'message' (fixes...
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 11:37:31 +0000 (13:37 +0200)]
PostProcessingError holds the message in the 'msg' property, not in 'message' (fixes #1323)

Causes DeprecationWarning: http://www.python.org/dev/peps/pep-0352/

11 years agoMerge remote-tracking branch 'Huarong/master'
Philipp Hagemeister [Wed, 28 Aug 2013 11:10:59 +0000 (13:10 +0200)]
Merge remote-tracking branch 'Huarong/master'

11 years agoMerge remote-tracking branch 'origin/reuse_ies'
Philipp Hagemeister [Wed, 28 Aug 2013 11:05:21 +0000 (13:05 +0200)]
Merge remote-tracking branch 'origin/reuse_ies'

11 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Wed, 28 Aug 2013 10:57:44 +0000 (12:57 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoFix platform name in Python 2 with --verbose (Closes #1228)
Philipp Hagemeister [Wed, 28 Aug 2013 10:57:10 +0000 (12:57 +0200)]
Fix platform name in Python 2 with --verbose (Closes #1228)

11 years agoAdd extractors for video.mit.edu and techtv.mit.edu (closes #1327)
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 10:51:22 +0000 (12:51 +0200)]
Add extractors for video.mit.edu and techtv.mit.edu (closes #1327)

video.mit.edu just embeds the videos from techtv.mit.edu

11 years agoRemove unused imports
Philipp Hagemeister [Wed, 28 Aug 2013 10:47:38 +0000 (12:47 +0200)]
Remove unused imports

11 years ago[generic] simply use urljoin
Philipp Hagemeister [Wed, 28 Aug 2013 10:47:27 +0000 (12:47 +0200)]
[generic] simply use urljoin

11 years agoPrint playpath with --get-url (Fixes #1334)
Philipp Hagemeister [Wed, 28 Aug 2013 10:14:45 +0000 (12:14 +0200)]
Print playpath with --get-url (Fixes #1334)

11 years ago[generic] Fix URL concatenation
Philipp Hagemeister [Wed, 28 Aug 2013 10:04:44 +0000 (12:04 +0200)]
[generic] Fix URL concatenation

When the url is something like http://example.org/foo/bar?x=y  and the added is file/video.mp4 , we want http://example.org/foo/file/video.mp4
Fixes #1268.

11 years agoMerge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister [Wed, 28 Aug 2013 09:57:18 +0000 (11:57 +0200)]
Merge branch 'master' of github.com:rg3/youtube-dl

11 years agoTolerate junk at the end of gzip-compressed content (#1268)
Philipp Hagemeister [Wed, 28 Aug 2013 09:57:13 +0000 (11:57 +0200)]
Tolerate junk at the end of gzip-compressed content (#1268)

11 years agoShow the time taken to download in the same format as the ETA
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 08:55:31 +0000 (10:55 +0200)]
Show the time taken to download in the same format as the ETA

11 years agoMerge pull request #1181 from h3xx/master
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 08:50:57 +0000 (10:50 +0200)]
Merge pull request #1181 from h3xx/master

Add some verbosity when reporting finished downloads

Remove the mixed use of tabs and spaces for indentation.

11 years ago[addanime] add file
Philipp Hagemeister [Wed, 28 Aug 2013 08:28:16 +0000 (10:28 +0200)]
[addanime] add file

11 years ago[youtube] update algo for length 88, thanks to @Ramhack (fixes #1328)
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 08:26:44 +0000 (10:26 +0200)]
[youtube] update algo for length 88, thanks to @Ramhack (fixes #1328)

11 years ago[cnn] remove debug print call.
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 08:20:37 +0000 (10:20 +0200)]
[cnn] remove debug print call.

11 years agoHTTPError is in urllib.error in Python 3, not in http.error
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 08:18:39 +0000 (10:18 +0200)]
HTTPError is in urllib.error in Python 3, not in http.error

11 years ago[addanime] improve
Philipp Hagemeister [Wed, 28 Aug 2013 02:25:38 +0000 (04:25 +0200)]
[addanime] improve

11 years ago[appletrailers] Add support
Philipp Hagemeister [Wed, 28 Aug 2013 00:18:44 +0000 (02:18 +0200)]
[appletrailers] Add support

11 years ago[cnn] Allow more URLs
Philipp Hagemeister [Tue, 27 Aug 2013 22:14:19 +0000 (00:14 +0200)]
[cnn] Allow more URLs

11 years agorelease 2013.08.28
Philipp Hagemeister [Tue, 27 Aug 2013 21:31:36 +0000 (23:31 +0200)]
release 2013.08.28

11 years agoDelete default user agent (Fixes #1309)
Philipp Hagemeister [Tue, 27 Aug 2013 21:31:24 +0000 (23:31 +0200)]
Delete default user agent (Fixes #1309)

11 years agoRevert "Install our own HTTPS handler as well (#1309)"
Philipp Hagemeister [Tue, 27 Aug 2013 21:15:01 +0000 (23:15 +0200)]
Revert "Install our own HTTPS handler as well (#1309)"

This reverts commit 36399e85765a6a04fd84126264af75382fcfd1f6 and fixes #1322.

11 years agoMerge pull request #1324 from whydoubt/fix_gplus
Jaime Marquínez Ferrándiz [Tue, 27 Aug 2013 20:36:39 +0000 (13:36 -0700)]
Merge pull request #1324 from whydoubt/fix_gplus

Initial slash in Google+ photos link was removed

11 years agoInitial slash in Google+ photos link was removed
Jeff Smith [Tue, 27 Aug 2013 19:38:50 +0000 (14:38 -0500)]
Initial slash in Google+ photos link was removed

11 years agoAdd an extractor for NBC news (closes #1320)
Jaime Marquínez Ferrándiz [Tue, 27 Aug 2013 10:38:30 +0000 (12:38 +0200)]
Add an  extractor for NBC news (closes #1320)

11 years agoAdd an extractor for CNN (closes #1318)
Jaime Marquínez Ferrándiz [Tue, 27 Aug 2013 09:56:48 +0000 (11:56 +0200)]
Add an extractor for CNN (closes #1318)

11 years ago[canalc2] Small improvements
Philipp Hagemeister [Tue, 27 Aug 2013 08:35:20 +0000 (10:35 +0200)]
[canalc2] Small improvements

11 years agoMerge remote-tracking branch 'Rudloff/canalc2'
Philipp Hagemeister [Tue, 27 Aug 2013 08:31:46 +0000 (10:31 +0200)]
Merge remote-tracking branch 'Rudloff/canalc2'

11 years ago[hark] get the song info in JSON and extract more information.
Jaime Marquínez Ferrándiz [Tue, 27 Aug 2013 08:25:38 +0000 (10:25 +0200)]
[hark] get the song info in JSON and extract more information.

11 years ago[canalplus] Accept player.canalplus.fr urls
Jaime Marquínez Ferrándiz [Tue, 27 Aug 2013 08:21:57 +0000 (10:21 +0200)]
[canalplus] Accept player.canalplus.fr urls

11 years agorelease 2013.08.27
Philipp Hagemeister [Tue, 27 Aug 2013 00:30:47 +0000 (02:30 +0200)]
release 2013.08.27

11 years agoMerge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister [Tue, 27 Aug 2013 00:00:23 +0000 (02:00 +0200)]
Merge branch 'master' of github.com:rg3/youtube-dl

11 years ago[trilulilu] Add support for trilulilu.ro
Philipp Hagemeister [Mon, 26 Aug 2013 23:59:00 +0000 (01:59 +0200)]
[trilulilu] Add support for trilulilu.ro

Fun fact: The ads (not yet supported) are loaded from youtube ;)

11 years agoMerge pull request #1315 from yasoob/master
Jaime Marquínez Ferrándiz [Mon, 26 Aug 2013 20:38:48 +0000 (13:38 -0700)]
Merge pull request #1315 from yasoob/master

fixed tests for c56 and dailymotion

11 years agofixed tests for c56 and dailymotion
M.Yasoob Ullah Khalid ☺ [Mon, 26 Aug 2013 20:00:17 +0000 (01:00 +0500)]
fixed tests for c56 and dailymotion

11 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Mon, 26 Aug 2013 19:29:44 +0000 (21:29 +0200)]
Merge remote-tracking branch 'origin/master'

11 years ago[generic] small typo
Philipp Hagemeister [Mon, 26 Aug 2013 19:29:31 +0000 (21:29 +0200)]
[generic] small typo

11 years agoMerge pull request #1231 from yasoob/master
Philipp Hagemeister [Mon, 26 Aug 2013 19:29:04 +0000 (12:29 -0700)]
Merge pull request #1231 from yasoob/master

Added an IE for hark.com

11 years agoMerge pull request #1310 from rzhxeo/rtlnow
Philipp Hagemeister [Sun, 25 Aug 2013 22:45:22 +0000 (15:45 -0700)]
Merge pull request #1310 from rzhxeo/rtlnow

Add support for http://superrtlnow.de

11 years ago[generic] add support for relative URLs (Fixes #1308)
Philipp Hagemeister [Sat, 24 Aug 2013 20:56:37 +0000 (22:56 +0200)]
[generic] add support for relative URLs (Fixes #1308)

11 years ago[generic] Support double slash URLs (Fixes #1309)
Philipp Hagemeister [Sat, 24 Aug 2013 20:49:52 +0000 (22:49 +0200)]
[generic] Support double slash URLs (Fixes #1309)

11 years agoInstall our own HTTPS handler as well (#1309)
Philipp Hagemeister [Sat, 24 Aug 2013 20:49:22 +0000 (22:49 +0200)]
Install our own HTTPS handler as well (#1309)

11 years ago[ro220] Add support for 220.ro
Philipp Hagemeister [Sat, 24 Aug 2013 19:10:03 +0000 (21:10 +0200)]
[ro220] Add support for 220.ro

11 years agoAdd SUPER RTL NOW to RTLnow extractor
rzhxeo [Sat, 24 Aug 2013 11:22:28 +0000 (13:22 +0200)]
Add SUPER RTL NOW to RTLnow extractor

11 years ago[youtube] update algo for length 84
Jaime Marquínez Ferrándiz [Sat, 24 Aug 2013 08:48:12 +0000 (10:48 +0200)]
[youtube] update algo for length 84

11 years agoSwitch to domain yt-dl.org
Philipp Hagemeister [Fri, 23 Aug 2013 21:57:23 +0000 (23:57 +0200)]
Switch to domain yt-dl.org

11 years agorelease 2013.08.23
Philipp Hagemeister [Fri, 23 Aug 2013 21:09:53 +0000 (23:09 +0200)]
release 2013.08.23

11 years ago[youtube] update algo for length 86 (fixes #1302)
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 20:36:59 +0000 (22:36 +0200)]
[youtube] update algo for length 86 (fixes #1302)

11 years agoAllow to specify multiple subtitles languages separated by commas (closes #518)
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 16:34:57 +0000 (18:34 +0200)]
Allow to specify multiple subtitles languages separated by commas (closes #518)

11 years agoPrint a message before embedding the subtitles
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 16:17:43 +0000 (18:17 +0200)]
Print a message before embedding the subtitles

11 years ago[xhamster] use determine_ext
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 15:23:34 +0000 (17:23 +0200)]
[xhamster] use determine_ext

11 years agoMerge pull request #1301 from rzhxeo/xhamster
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 15:21:30 +0000 (17:21 +0200)]
Merge pull request #1301 from rzhxeo/xhamster

XHamsterIE: Fix video extension and add video description

11 years agoXHamsterIE: Add video description
rzhxeo [Fri, 23 Aug 2013 14:40:20 +0000 (16:40 +0200)]
XHamsterIE: Add video description

11 years agoXHamsterIE: Fix video extension
rzhxeo [Fri, 23 Aug 2013 14:33:41 +0000 (16:33 +0200)]
XHamsterIE: Fix video extension

Cut off GET parameter

11 years agoAdd a post processor for embedding subtitles in mp4 videos (closes #1052)
Jaime Marquínez Ferrándiz [Sat, 20 Jul 2013 10:48:57 +0000 (12:48 +0200)]
Add a post processor for embedding subtitles in mp4 videos (closes #1052)

11 years ago[youtube] Fix download of subtitles with '--all-subs'
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 11:14:22 +0000 (13:14 +0200)]
[youtube] Fix download of subtitles with '--all-subs'

If _extract_subtitles is called the option 'write subtitles' is always true.

11 years agoMerge pull request #937 from jaimeMF/subtitles_rework
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 09:40:25 +0000 (02:40 -0700)]
Merge pull request #937 from jaimeMF/subtitles_rework

Subtitles rework

11 years ago[youtube] add algo for length 80 and update player info
Jaime Marquínez Ferrándiz [Fri, 23 Aug 2013 09:33:56 +0000 (11:33 +0200)]
[youtube] add algo for length 80 and update player info

11 years agoMerge pull request #1297 from iemejia/master
Philipp Hagemeister [Thu, 22 Aug 2013 23:30:14 +0000 (16:30 -0700)]
Merge pull request #1297 from iemejia/master

[subtitles] separated subtitle options in their own group

11 years agorelease 2013.08.22
Philipp Hagemeister [Thu, 22 Aug 2013 21:29:42 +0000 (23:29 +0200)]
release 2013.08.22

11 years ago[videofyme] Add an additional quality (they change between downloads of the info...
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 21:23:52 +0000 (23:23 +0200)]
[videofyme] Add an additional quality (they change between downloads of the info) and update md5 sum of the test video

11 years ago[subtitles] separated subtitle options in their own group
Ismael Mejia [Thu, 8 Aug 2013 07:53:25 +0000 (09:53 +0200)]
[subtitles] separated subtitle options in their own group

11 years ago[youtube] update algo for length 82 (fixes #1296)
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 20:35:15 +0000 (22:35 +0200)]
[youtube] update algo for length 82 (fixes #1296)

11 years ago[youtube] fix the order of DASH formats
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 17:45:24 +0000 (19:45 +0200)]
[youtube] fix the order of DASH formats

11 years agoMerge pull request #1279 from xanadu/master
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 17:33:34 +0000 (19:33 +0200)]
Merge pull request #1279 from xanadu/master

Add YouTube DASH formats to YouTubeIE

11 years agoMerge pull request #1266 from MiLk/py-generator
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 17:18:58 +0000 (10:18 -0700)]
Merge pull request #1266 from MiLk/py-generator

Update the youtube algorithm generator

11 years agolxml is not part of the standard library.
Pierre Rudloff [Thu, 22 Aug 2013 12:47:51 +0000 (14:47 +0200)]
lxml is not part of the standard library.

11 years agoExtractor for canalc2.tv
Pierre Rudloff [Thu, 22 Aug 2013 11:54:23 +0000 (13:54 +0200)]
Extractor for canalc2.tv

11 years agoCredit Pierre Rudloff for JeuxVideoIE and UnistraIE
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 11:21:32 +0000 (13:21 +0200)]
Credit Pierre Rudloff for JeuxVideoIE and UnistraIE

11 years agoRename utv.py to unistra.py and extract more info
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 11:19:35 +0000 (13:19 +0200)]
Rename utv.py to unistra.py and extract more info

There are other sites that could be named utv, which would conflict if they are added

11 years agoDownload from utv.unistra.fr (PR #1271)
Pierre Rudloff [Sun, 18 Aug 2013 15:02:39 +0000 (17:02 +0200)]
Download from utv.unistra.fr (PR #1271)

Squashed to a single commit to keep the file 'youtube-dl' unchanged and remove the revert commit.

11 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Thu, 22 Aug 2013 10:55:58 +0000 (12:55 +0200)]
Merge remote-tracking branch 'upstream/master'

11 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Thu, 22 Aug 2013 10:54:17 +0000 (12:54 +0200)]
Merge remote-tracking branch 'upstream/master'

11 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Thu, 22 Aug 2013 10:52:05 +0000 (12:52 +0200)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
youtube_dl/extractor/jeuxvideo.py

11 years ago[jeuxvideo] Extract more information and add test
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 10:37:34 +0000 (12:37 +0200)]
[jeuxvideo] Extract more information and add test

11 years agoMerge pull request #1267 from Rudloff/master
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 10:24:27 +0000 (12:24 +0200)]
Merge pull request #1267 from Rudloff/master

Download videos from jeuxvideo.com

Edited to keep the file 'youtube-dl' unchanged.

11 years agoDownload videos from jeuxvideo.com
Pierre Rudloff [Sun, 18 Aug 2013 14:11:47 +0000 (16:11 +0200)]
Download videos from jeuxvideo.com

11 years agoAdd an extractor for PBS (closes #870 and #873)
Jaime Marquínez Ferrándiz [Thu, 22 Aug 2013 09:57:21 +0000 (11:57 +0200)]
Add an extractor for PBS (closes #870 and #873)

11 years agoAdd an extractor for tv.slashdot.org (closes #1192)
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 19:51:58 +0000 (21:51 +0200)]
Add an extractor for tv.slashdot.org (closes #1192)

It uses the ooyala platform, so it just extracts the ooyala url.

11 years ago[youtube] update uploader name for a test video: 'IconaPop' has changed to 'Icona...
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 17:25:54 +0000 (19:25 +0200)]
[youtube] update uploader name for a test video: 'IconaPop' has changed to 'Icona Pop'

11 years ago[statigram] change test video
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 17:20:27 +0000 (19:20 +0200)]
[statigram] change test video

The old one cannot be accessed.

11 years ago[funnyordie] fix extraction of video url and title
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 16:58:25 +0000 (18:58 +0200)]
[funnyordie] fix extraction of video url and title

11 years ago[vevo] Fix urls with a query (#1258)
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 16:20:03 +0000 (18:20 +0200)]
[vevo] Fix urls with a query (#1258)

11 years ago[soundcloud] Support widget urls (fixes #1252)
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 15:06:37 +0000 (17:06 +0200)]
[soundcloud] Support widget urls (fixes #1252)

11 years ago[vimeo] extract information for Vimeo Pro videos from http://player.vimeo.com/video...
Jaime Marquínez Ferrándiz [Wed, 21 Aug 2013 11:48:19 +0000 (13:48 +0200)]
[vimeo] extract information for Vimeo Pro videos from player.vimeo.com/video/{video_id} (fixes #1197)

For some videos https://vimeo.com/{video_id} doesn't work