pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-01 07:58:00 +09:00
Code Issues Projects Releases Wiki Activity
4,209 Commits 10 Branches 1,120 Tags 271 MiB
98acdc895b
Commit Graph

1805 Commits

Author SHA1 Message Date
Jaime Marquínez Ferrándiz
d882161d5a [infoq] Simplify and use unicode_literals 2014-01-29 15:34:35 +01:00
Jaime Marquínez Ferrándiz
d4a21e0b49 [tutv] Simplify and use unicode_literals 2014-01-29 15:22:41 +01:00
Jaime Marquínez Ferrándiz
26a78d4bbf [nba] Simplify and use unicode_literals 
Remove the commented parts for extracting the upload date
 2014-01-29 15:16:18 +01:00
Philipp Hagemeister
b11cec4162 [youtube:user] Fix id key (Fixes #1745) 2014-01-29 11:16:12 +01:00
Philipp Hagemeister
7eeb5bef24 [liveleak] Simplify 2014-01-28 21:57:38 +01:00
Philipp Hagemeister
9d2032932c Merge remote-tracking branch 'dstftw/ivi' 2014-01-28 21:47:05 +01:00
Philipp Hagemeister
6490306017 Merge remote-tracking branch 'dstftw/channel9' 2014-01-28 21:46:42 +01:00
dst
ceb2b7d257 [ivi] Fix test and use unicode literals 2014-01-29 02:20:48 +07:00
dst
459a53c2c2 [channel9] Remove unnecessary coding cookie 2014-01-29 02:07:29 +07:00
dst
adc267eebf [channel9] Use unicode literals 2014-01-29 02:00:56 +07:00
dst
ffe8f62d27 [smotri] Simplify login and use unicode literals 2014-01-29 01:52:57 +07:00
Jaime Marquínez Ferrándiz
ed85007039 [ninegag] Use unicode_literals 2014-01-28 18:55:06 +01:00
Jaime Marquínez Ferrándiz
5aaca50d60 [keek] Simplify and use unicode_literals 2014-01-28 18:47:31 +01:00
Jaime Marquínez Ferrándiz
869baf3565 [funnyordie] Simplify and use unicode_literals 2014-01-28 18:41:39 +01:00
Philipp Hagemeister
e299f6d27f [pornhd] Fix 2014-01-28 03:53:00 +01:00
Philipp Hagemeister
218c15ab59 Merge remote-tracking branch 'mike/tumblr-url' 2014-01-28 03:35:52 +01:00
Philipp Hagemeister
17ab4d3b5e [brightcove] Move test to generic 2014-01-28 03:35:32 +01:00
Philipp Hagemeister
31ef0ff038 Merge remote-tracking branch 'dstftw/rutube-channel' 2014-01-28 03:32:22 +01:00
Philipp Hagemeister
37e3b90d59 [rutube] Simplify 2014-01-28 03:32:07 +01:00
dst
00ff8f92a5 [rutube] Update test 2014-01-28 09:31:14 +07:00
Philipp Hagemeister
4857beba3a Merge remote-tracking branch 'dstftw/rutube-channel' 2014-01-28 03:30:21 +01:00
Philipp Hagemeister
c1e60cc2bf Merge remote-tracking branch 'dstftw/master' 2014-01-28 03:29:10 +01:00
dst
a3978a6159 [imdb] Fix duplicated entries bug 2014-01-28 09:12:23 +07:00
dst
e3a9f32f52 [rutube] Add support for user videos 2014-01-28 08:47:17 +07:00
dst
a2fb2a2134 [rutube] Improve video extractor 2014-01-28 08:19:45 +07:00
MikeCol
9e8ee54553 VALID_URL changed to match different kinds of Tumblr-URLs 2014-01-28 01:41:18 +01:00
Philipp Hagemeister
117bec936c [brightcove] Parse URL from meta element if available (Fixes #2253) 2014-01-28 01:01:23 +01:00
dst
1547c8cc88 [rutube] Add support for channels and movies 2014-01-28 06:56:09 +07:00
Philipp Hagemeister
075911d48e [la7] Skip test on travis 2014-01-27 23:47:22 +01:00
Philipp Hagemeister
f9b8549609 [ard] Support multiple formats (Closes #2247) 2014-01-27 18:40:10 +01:00
Jaime Marquínez Ferrándiz
e2ba07024f Merge remote-tracking branch 'origin/master' 2014-01-27 12:45:59 +01:00
Jaime Marquínez Ferrándiz
9b05bd42e5 [discovery] Extract more info and simplify 2014-01-27 12:41:30 +01:00
Philipp Hagemeister
b6d3a99678 [cliphunter] Simplify (#2233) 2014-01-27 12:39:39 +01:00
Jaime Marquínez Ferrándiz
96d7b8873a Merge remote-tracking branch 'sahutd/master' 2014-01-27 12:21:00 +01:00
Philipp Hagemeister
efc867775e [cliphunter] Simplify 2014-01-27 07:55:30 +01:00
Philipp Hagemeister
5ab772f09c Merge branch 'cliphunter' of https://github.com/pornophage/youtube-dl 2014-01-27 07:48:51 +01:00
MikeCol
4d9be98dbc Malemotion extractor 2014-01-27 07:43:02 +01:00
Mike Col
6737907826 [tumblr] Fix thumbnail extraction 
Signed-off-by: Philipp Hagemeister <phihag@phihag.de>
 2014-01-27 07:38:55 +01:00
Philipp Hagemeister
c060b77446 [tumblr] Use unicode_literals 2014-01-27 07:36:18 +01:00
Philipp Hagemeister
7e8caf30c0 Throw an error if no video formats are found 2014-01-27 07:31:54 +01:00
Philipp Hagemeister
1da1558f46 [la7] Support more URLs 2014-01-27 07:08:01 +01:00
Philipp Hagemeister
a17d16d59c [la7] Add support 2014-01-27 07:05:28 +01:00
Philipp Hagemeister
d16076ff3e [huffpost] Fix extractor 2014-01-27 06:55:35 +01:00
Philipp Hagemeister
db1f388878 [huffpost] Add support 2014-01-27 05:47:38 +01:00
Philipp Hagemeister
0f2999fe2b Merge pull request #2221 from Rudloff/master 
Removed websurg extractor
 2014-01-26 18:03:26 -08:00
sahutd
53bfd6b24c Added support for Discovery Issue #2227 2014-01-26 14:05:34 +05:30
Jaime Marquínez Ferrándiz
5700e7792a [youtube] Encode the data when submitting the form for confirming the age 
Needed on python 3
 2014-01-25 17:22:41 +01:00
Jaime Marquínez Ferrándiz
38c2e5b8d5 [youtube] Use https: in more urls 2014-01-25 17:11:55 +01:00
Jaime Marquínez Ferrándiz
beddbc2ad1 [youtube:toplist] Make the regex for finding the playlist link more flexible 
`title={foo}` may not be at the end of the `href` string.
 2014-01-25 15:47:03 +01:00
Jaime Marquínez Ferrándiz
944d65c762 [extractor/common] Encode the url when calculating the md5 with —write-pages option 
This doesn’t cause any problem in python 2.*, but on python 3 the `md5` function only accepts bytes.
 2014-01-25 15:32:56 +01:00
Philipp Hagemeister
f945612bd0 [rtlnow] Simplify 2014-01-25 14:18:54 +01:00
Jaime Marquínez Ferrándiz
59188de113 Properly escape ‘.’ in some _VALID_URL properties 2014-01-25 11:48:08 +01:00
Jaime Marquínez Ferrándiz
352d08e3e5 Add an extractor for freespeech.org (closes #2234) 2014-01-25 11:31:30 +01:00
Pornophage
bacb5e4f44 Minor fixes 
Remove empty description
Set correct md5 test
 2014-01-25 02:34:08 +01:00
Pornophage
008af8660b Add cliphunter extractor 2014-01-25 01:46:52 +01:00
Philipp Hagemeister
2c5bae429a [youtube] Fix new formats 2014-01-24 00:06:26 +01:00
Philipp Hagemeister
1394ce65b4 [youtube] Add new formats (Fixes #2221) 2014-01-23 23:54:06 +01:00
Pierre Rudloff
67ccb77197 Removed websurg extractor 2014-01-23 23:42:34 +01:00
Philipp Hagemeister
0b65e5d40f [youtube] Do not break upon unknown formats 2014-01-23 23:21:42 +01:00
Philipp Hagemeister
975d35dbab [youtube:truncated_url] Also match mail subscription links (#2214) 2014-01-23 16:14:54 +01:00
Jaime Marquínez Ferrándiz
8b769664c4 [sina] Recognize http://video.sina.com.cn/v/b/{id}-*.html urls (fixes #2212) 2014-01-23 14:03:14 +01:00
Jaime Marquínez Ferrándiz
76f270a46a [sina] use unicode_literals 2014-01-23 14:00:29 +01:00
Philipp Hagemeister
924f47f7b6 [rottentomatoes] Use unicode_literals 2014-01-23 04:05:58 +01:00
Philipp Hagemeister
22ff1c4a93 [xhamster] Futher simplification 2014-01-23 04:04:39 +01:00
Philipp Hagemeister
35409e1101 [xhamster] Use unicode_literals 2014-01-23 03:52:59 +01:00
Mike Col
65d781128a [xhamster] Add support for hd video 
Signed-off-by: Philipp Hagemeister <phihag@phihag.de>
 2014-01-23 03:51:09 +01:00
Philipp Hagemeister
066f6a0630 [nowness] Add support 2014-01-23 00:12:47 +01:00
Philipp Hagemeister
12ed57418c [gamespot] Fix regexp 2014-01-22 22:31:19 +01:00
Philipp Hagemeister
4919603f66 [youtube] Make DASH manifest download conditional for now 
DASH download fails on many videos (all with encrypted signatures? not sure yet), for example 07FYdnEawAQ, with a 403.
 2014-01-22 21:56:38 +01:00
Philipp Hagemeister
bd2d82a5d3 [newgrounds] Simplify 2014-01-22 21:41:28 +01:00
Philipp Hagemeister
65697b3bf3 Merge branch 'paged-lists' 
Conflicts:
	test/test_utils.py
	youtube_dl/extractor/youtube.py
 2014-01-22 20:00:16 +01:00
Philipp Hagemeister
50317b111d Merge branch 'youtube-dash-manifest' 
Conflicts:
	youtube_dl/extractor/youtube.py
 2014-01-22 19:58:31 +01:00
Philipp Hagemeister
d7975ea287 [xvideos] Simplify 2014-01-22 19:02:48 +01:00
Mike Col
714d709a31 [xvideos] Fix thumbnail extraction 
Signed-off-by: Philipp Hagemeister <phihag@phihag.de>
 2014-01-22 19:01:41 +01:00
Philipp Hagemeister
11577ec054 [cspan] Disable test 
It works fine from all my machines, no matter where, but from travis, we get lots of 403s.
Maybe another project is scraping CSPAN from travis and they're blocking the travis machines?
 2014-01-22 15:10:02 +01:00
Philipp Hagemeister
04b4d394d9 Add new --default-search option (#2193) 2014-01-22 14:16:43 +01:00
Jaime Marquínez Ferrándiz
130f12985a [comedycentral] Use the generic _real_extract provided by the base class 2014-01-22 11:44:26 +01:00
Jaime Marquínez Ferrándiz
4ca5d43cd8 Merge pull request #2195 from dstftw/master 
[space] Add support for mobile URLs
 2014-01-22 02:39:17 -08:00
Jaime Marquínez Ferrándiz
4bbf139aa7 [southparkstudios] Use the generic _real_extract provided by the base class 2014-01-22 11:35:17 +01:00
dst
47739636a9 [space] Add support for mobile URLs 2014-01-22 17:25:32 +07:00
Jaime Marquínez Ferrándiz
407ae733ab [cspan] Make ‘www’ optional and improve the regex for extracting the id (fixes #2194) 2014-01-22 11:06:03 +01:00
Jaime Marquínez Ferrándiz
c39f7013e1 [gametrailers] Use the generic _real_extract provided by the base class 2014-01-22 10:51:17 +01:00
Philipp Hagemeister
a4a028323e [comedycentral] Use unicode_literals 2014-01-22 03:50:49 +01:00
Philipp Hagemeister
780ee4e501 [comedycentral] Adapt testcase 
In contrast to other sites, ComedyCentral seems to understand how to sensibly use MTV IE, but the additional text shouldn't hurt.
 2014-01-22 03:49:17 +01:00
Philipp Hagemeister
d7b51547c0 [imdb:list] Switch to loading the webpage 
The RSS method seems to be defunct.
 2014-01-22 03:41:25 +01:00
Philipp Hagemeister
43030f36db [d8] typo 2014-01-22 03:10:31 +01:00
Philipp Hagemeister
48c63f1653 [d8] disable test; video got deleted 2014-01-22 03:09:21 +01:00
Philipp Hagemeister
90f479b6d5 [novamov] Skip tests 2014-01-22 03:04:10 +01:00
Philipp Hagemeister
d3a1c71917 [ringtv] Fix and add news extraction 2014-01-22 02:16:40 +01:00
Philipp Hagemeister
af1588c05f [mtv] Update tests and xpath function for new title extraction 2014-01-22 02:04:51 +01:00
Philipp Hagemeister
2250865fb0 [Wimp] Use new URL relay method 2014-01-22 02:01:39 +01:00
Philipp Hagemeister
99f770caa8 [hotnewhiphop] Retrieve media key 2014-01-22 01:55:50 +01:00
Philipp Hagemeister
a70515c0fd [servingsys] Do not run test on travis 
Apparantly, even the advertisers do geoblocking now!?
From the US, this isn't outright blocked, but there are no videos returned.
 2014-01-22 00:27:18 +01:00
Philipp Hagemeister
6562df768d Merge branch 'master' of github.com:rg3/youtube-dl 
Conflicts:
	youtube_dl/extractor/mtv.py
 2014-01-22 00:21:27 +01:00
Philipp Hagemeister
06769acd71 [gametrailers] Use unicode_literals 
Conflicts:
	youtube_dl/extractor/gametrailers.py
 2014-01-22 00:18:52 +01:00
Philipp Hagemeister
32dac6943d [mtv] Use unicode_literals 2014-01-22 00:18:09 +01:00
Philipp Hagemeister
90834c78fe [mtv] Fix title for gametrailers (Fixes #2188) 
We now prefer the title including the category, because that title is what is presented at the actual sites.
 2014-01-22 00:17:33 +01:00
Jaime Marquínez Ferrándiz
47917f24c4 [brightcove] Fix extraction of embedded videos 
There was a leading ‘:’ in the regex.
The ‘flashvars’ parameter is not always available.
 2014-01-21 22:04:46 +01:00
Jaime Marquínez Ferrándiz
d614aa40e3 [brightcove] Fix check for url in the result 
It may have the ‘formats’ field instead of ‘url’.
 2014-01-21 21:53:10 +01:00
Jaime Marquínez Ferrándiz
bc4ba05fcb [mtv] Add an extractor for mtviggy.com (#2072) 2014-01-21 20:59:31 +01:00
Jaime Marquínez Ferrándiz
8d9453b9e8 Add an extractor for spike.com (#2072) 
Added a generic _real_extract to MTVServicesInfoExtractor
 2014-01-21 20:54:47 +01:00
Jaime Marquínez Ferrándiz
e4f320a4d0 [mtv] Check for geo-blocked videos in the xml document, not in the xml’s string 
Allows to use the `_download_xml` method
 2014-01-21 19:59:02 +01:00
Jaime Marquínez Ferrándiz
ef9f2ba7af [mtv] Use unicode_literals 2014-01-21 19:58:21 +01:00
Philipp Hagemeister
913f32929b [vk] Add support for HQ videos (Fixes #2187) 2014-01-21 18:21:44 +01:00
Philipp Hagemeister
9834872bf6 [facebook] Add support for embeds 
Example URL: http://www.hostblogger.de/blog/archives/6181-Auto-jagt-Betonmischer.html
 2014-01-21 18:10:17 +01:00
Philipp Hagemeister
94a23d2a1e [vk] Use unicode_literals 2014-01-21 17:32:03 +01:00
Philipp Hagemeister
608bf69880 [vk] avoid built-in names 2014-01-21 17:29:04 +01:00
Philipp Hagemeister
032b3df5af [redtube] Use unicode_literals 2014-01-21 14:16:44 +01:00
Mike Col
9d11a41fe4 [redtube] Add support for thumbnails 
Signed-off-by: Philipp Hagemeister <phihag@phihag.de>
 2014-01-21 14:14:55 +01:00
Philipp Hagemeister
7b0817e8e1 [servingsys] Add support 
This also adds support for brightcove advertisements.
Fixes #2181
 2014-01-21 02:09:51 +01:00
Philipp Hagemeister
9d4288b2d4 [extractor/common] Clarify when and when not we generate the filename 2014-01-21 01:41:13 +01:00
Philipp Hagemeister
3486df383b [generic] Improve testcase 2014-01-21 01:40:34 +01:00
Philipp Hagemeister
b60016e831 Deal with implicitly UTF-16 decoded webpages 
These webpages don't specify an encoding and rely on the BOM
 2014-01-21 01:39:40 +01:00
Philipp Hagemeister
5aafe895fc Correct XML ampersand fixup 2014-01-20 22:11:34 +01:00
Philipp Hagemeister
b7ab059084 Add infrastructure for paged lists 
This commit allows to download pages in playlists as needed instead of all at once.
Before this commit,
    youtube-dl http://www.youtube.com/user/ANNnewsCH/videos --playlist-end 2 --skip-download
took quite some time - now it's almost instantaneous.
As an example, the youtube:user extractor has been converted.
Fixes #2175
 2014-01-20 11:36:47 +01:00
Philipp Hagemeister
c91778f8c0 [youtube] Fall back to header if playlist title is not available 
Sometimes (in about 10% of requests), the og:title is missing for a weird reason.
See #2170 for an example
 2014-01-20 02:45:51 +01:00
Philipp Hagemeister
5016f3eac8 [myspace] More robust mediatype check 2014-01-20 02:44:08 +01:00
Jaime Marquínez Ferrándiz
efb1bb90a0 [myspace] Add support for song urls (fixes #2040) 2014-01-19 11:38:48 +01:00
Philipp Hagemeister
4cf393bb4b [dropbox] Correct test case (#2171) 2014-01-19 06:16:40 +01:00
Philipp Hagemeister
ce4e242a6f [dropbox] PEP8 and simplify (#2171) 2014-01-19 06:14:24 +01:00
sahutd
6b79f40c3d Added support for Dropbox 2014-01-19 10:20:26 +05:30
Philipp Hagemeister
dd27fd1739 [youtube] Download DASH manifest 
If given, download and parse the DASH manifest file, in order to get ultra-HQ formats.
Fixes #2166
 2014-01-19 05:47:20 +01:00
sahutd
2a7c35dd46 added dropbox support 2014-01-18 20:50:42 +05:30
sahutd
8da531359e Added dropbox support. issue #2055 2014-01-18 20:45:53 +05:30
Philipp Hagemeister
3ec05685f7 [extractor/common] Limit --write-pages filename to 200 chars 
This avoids problems with very long URLs.
 2014-01-17 14:47:47 +01:00
Philipp Hagemeister
877bfd69d1 [cnn] Improve test 2014-01-17 05:06:13 +01:00
Philipp Hagemeister
f68cd00fe3 [kankan] Skip test 2014-01-17 04:21:54 +01:00
Philipp Hagemeister
ca70d215cf [kankan] Simplify 2014-01-17 04:21:22 +01:00
Philipp Hagemeister
d0390a0c92 [mixcloud] Use unicode_literals 2014-01-17 04:06:18 +01:00
Philipp Hagemeister
dd2535c38a [mixcloud] Fix URL extraction 2014-01-17 04:05:15 +01:00
Philipp Hagemeister
b78d180170 [mpora] Fix uploader name extraction 2014-01-17 03:59:42 +01:00
Philipp Hagemeister
26dca1661e [ted] Updated checksums 2014-01-17 03:54:54 +01:00
Philipp Hagemeister
f853f8594d [ted] Use unicode_literals 2014-01-17 03:52:17 +01:00
Philipp Hagemeister
d0da491e1e [condenast] Allow multiple formats, and sort centralized 2014-01-17 03:36:03 +01:00
Philipp Hagemeister
6e249060cf [condenast] Use unicode_literals 2014-01-17 03:32:02 +01:00
Philipp Hagemeister
fbcd7b5f83 [soundcloud] Use unicode_literals and centralized sorting 2014-01-17 03:29:41 +01:00
Philipp Hagemeister
9ac0a67581 [spankwire] Use centralized format sorting and unicode_literals 2014-01-17 03:26:05 +01:00
Philipp Hagemeister
befdc8f3b6 [teamcoco] Use centralized sorting 2014-01-17 03:22:02 +01:00
Philipp Hagemeister
bb198c95e2 [teamcoco] Use unicode_literals 2014-01-17 03:15:09 +01:00
Philipp Hagemeister
c1195541b7 [gamespot] Use unicode_literals 2014-01-17 03:13:40 +01:00
Philipp Hagemeister
26844eb57b [franceinter] Remove superfluous whitespace 2014-01-17 03:10:54 +01:00
Philipp Hagemeister
677b3ce82f [franceinter] Minor improvements (#2152) 2014-01-17 03:09:07 +01:00
Philipp Hagemeister
fabfe17d5e [flickr] Use unicode literals 2014-01-17 03:07:01 +01:00
Philipp Hagemeister
82696d5d5d Merge remote-tracking branch 'sahutd/master' 2014-01-17 03:02:55 +01:00
Philipp Hagemeister
484aaeb204 [everyonesmixtape] Add support (Fixes #2161) 2014-01-17 02:56:13 +01:00
Philipp Hagemeister
2f21eb2db6 [generic] Do not fetch XML URLs (Fixes #2162) 2014-01-17 02:13:00 +01:00
Jaime Marquínez Ferrándiz
c11529618a [redtube] Make ‘http:’ not optional (closes #2160) 
If the url doesn’t specify the protocol we can’t directly use it to download the webpage, we would need to build a new url.
Instead, we let the generic extractor add the protocol.
 2014-01-16 11:21:33 +01:00
sahutd
c8650f7ecd Made modification as suggested on https://github.com/rg3/youtube-dl/pull/2151 2014-01-15 16:48:55 +05:30
Saimadhav Heblikar
14e7543a5a franceinter [Issue #2105] 
Added franceinterIE import to reflect addition of FranceInter support. Issue #2105
 2014-01-15 11:51:12 +05:30
Saimadhav Heblikar
bf6705f584 Added franceinter [Issue #2105] 2014-01-15 11:49:50 +05:30
Filippo Valsorda
a9f53ce7ea Add a couple of missing http:// in test URLs 2014-01-14 16:01:31 -05:00
Philipp Hagemeister
5d8683a5cd [nowvideo] Add support for .sx version (Fixes #2127) 2014-01-12 01:26:37 +01:00
dst
7ee40b5d1c [lynda] Add support for member accounts and paid videos (Closes #2125) 2014-01-12 05:31:56 +07:00
Jaime Marquínez Ferrándiz
db22af36ec [brightcove] The ‘id’ attribute is not always present in the object tag (fixes #2132) 
It looks like the ‘flashId’ parameter is not needed.
 2014-01-10 19:39:42 +01:00
Philipp Hagemeister
f8b5ab8cfa [bandcamp] Make thumbnail and uploader optional 
Fixes #2129
 2014-01-09 23:04:36 +01:00
Jaime Marquínez Ferrándiz
298f16f954 [bandcamp] Fix variable name 2014-01-09 20:23:28 +01:00
Philipp Hagemeister
ce6b9a2dba [youtube] Add a pseudo format for rtmp videos (#2123) 2014-01-09 02:38:50 +01:00
Philipp Hagemeister
c3197e3e5c [youtube] Correct subtitle URL (Fixes #2120) 2014-01-09 01:36:21 +01:00
Philipp Hagemeister
3fabeaa1f4 [vimeo] Support protocol-relative URLs 2014-01-08 22:42:52 +01:00
Jaime Marquínez Ferrándiz
9d6192a5b8 [bloomberg] Fix ooyala url extraction 2014-01-08 18:18:45 +01:00
Jaime Marquínez Ferrándiz
469ec9416a [francetv] Add extractor for Culturebox (closes #2117) 2014-01-08 16:16:34 +01:00
dst
5f59ee7942 [novamov] Remove superfluous tabs 2014-01-08 08:11:46 +07:00
dst
8f89e68781 [novamov] Add embedded player support 2014-01-08 08:09:13 +07:00
Philipp Hagemeister
10bff13a66 [novamov] Simplify 2014-01-08 01:18:47 +01:00
Philipp Hagemeister
166ff8a3c7 Merge remote-tracking branch 'dstftw/novamov' 2014-01-08 01:15:43 +01:00
Philipp Hagemeister
b4622a328b Use double quotes in error message (#2112) 
On Windows, double quotes are required, because single quotes get served to youtube-dl. (Yes, cmd.exe is crazy like that).
On other system, both double and single quotes are fine, unless the string contains a dollar sign (then you need single quotes).
Since virtually no URLs contain dollar signs, double quotes should do.
 2014-01-08 00:05:11 +01:00
dst
cc253000e4 [novamov] Add support for novamov.com (Fixes #2035) 2014-01-07 22:18:10 +07:00
Philipp Hagemeister
42e4fcf23a [generic] Fix regexes 2014-01-07 11:04:27 +01:00
Philipp Hagemeister
9c63128668 [metacritic] Use centralized sorting and unicode_literals 2014-01-07 10:27:35 +01:00
Philipp Hagemeister
9933b57430 [pornhub] Use centralized sorting 2014-01-07 10:25:34 +01:00
Philipp Hagemeister
84c92dc00f [c56] Add suppot for multiple formats 2014-01-07 10:19:15 +01:00
Philipp Hagemeister
42154ad5bc [archiveorg] Use centralized sorting 2014-01-07 10:16:22 +01:00
Philipp Hagemeister
3798eadccd More unicode literals 2014-01-07 10:06:30 +01:00
Philipp Hagemeister
0eecc6a417 [vimeo] Add support for passwords for player. URLs 
Fixes #2053
 2014-01-07 09:52:00 +01:00
Philipp Hagemeister
0dc13f4c4a Correctly set IE_NAME field 2014-01-07 09:45:58 +01:00
Philipp Hagemeister
f577e0ce15 switch more to unicode_literals 2014-01-07 09:45:40 +01:00
Philipp Hagemeister
ecfef3e5bf +unicode_literals 2014-01-07 09:41:13 +01:00
Philipp Hagemeister
3d3538e422 [khanacademy] Add support (Fixes #2066) 2014-01-07 09:35:34 +01:00
Philipp Hagemeister
c93c2ab1c3 [mpora] Add support (Fixes #2096) 2014-01-07 08:07:46 +01:00
Philipp Hagemeister
7b09a4d847 [lynda] Fix download if subtitles were not requested 2014-01-07 07:17:49 +01:00
Philipp Hagemeister
73a25b30ea [lynda] Remove superfluous space 2014-01-07 07:14:46 +01:00
Philipp Hagemeister
ac260dd81e [lynda] Remove useless u"" 2014-01-07 07:14:12 +01:00
Philipp Hagemeister
48a2034671 [vimeo] Fix playlist URL matching 2014-01-07 07:13:47 +01:00
Philipp Hagemeister
4f81667d76 [orf] Remove unused variable name 2014-01-07 05:51:46 +01:00
Philipp Hagemeister
79f8295303 Use original Referer URL in Brightcove requests (Fixes #2110) 2014-01-07 05:34:14 +01:00
Philipp Hagemeister
400e58103d [brightcove] Use unicode_literals 2014-01-07 05:23:20 +01:00
Philipp Hagemeister
fcee8ee784 [vimeo] Use _search_regex 2014-01-07 05:19:28 +01:00
Philipp Hagemeister
9148eb002b [vimeo] Use unicode_literals 2014-01-06 23:38:16 +01:00
Philipp Hagemeister
559e370f44 [vimeo] Proper warning when password is required (Fixes #2053) 
In player. URLs, the password warning is different.
 2014-01-06 23:35:27 +01:00
Philipp Hagemeister
9a6422a81e Merge remote-tracking branch 'origin/master' 2014-01-06 17:37:20 +01:00
Philipp Hagemeister
fcea44c6d5 [vimeo] Add support for review pages 
Since the regexp is already overboarding and review pages have a distinct URL format (with non-trivial stuff after the ID), use a dedicated IE.
Fixes #2106
 2014-01-06 17:34:23 +01:00
Philipp Hagemeister
5d73273f6f [orf] Use new extraction method (Fixes #2057) 2014-01-06 17:15:27 +01:00
Philipp Hagemeister
c11a0611d9 [veehd] Send requests twice (Fixes #2102) 2014-01-06 12:54:01 +01:00
Philipp Hagemeister
796495886e [generic] Use unicode_literals instead of duplicating the u' 2014-01-06 01:47:52 +01:00
Philipp Hagemeister
fa27f667c8 Merge pull request #2104 from dstftw/lynda 
[lynda] Add subtitles extraction
 2014-01-05 16:44:21 -08:00
Philipp Hagemeister
fc9713a1d2 [youtube] Support jwplayer with YouTube URLs (Closes #2075) 2014-01-06 01:42:58 +01:00
dst
62bcfa8c57 [lynda] Add subtitles extraction 2014-01-05 23:59:33 +07:00
Philipp Hagemeister
a339e5cfb5 Remove unused imports 2014-01-05 05:48:30 +01:00
Philipp Hagemeister
f46f4a995b [veoh] Simplify 2014-01-05 05:48:12 +01:00
Philipp Hagemeister
4ddba33f78 [veoh] Add support for mobile URLs 
Fixes #2052
 2014-01-05 05:47:50 +01:00
Philipp Hagemeister
d981cef6b9 [generic] Support gorillavid.in 
Previously, we were a little bit over-eager and got a random swf file.
Fixes #2084.
 2014-01-05 05:34:08 +01:00
Philipp Hagemeister
ca9e792253 [cspan] Use HTTP download (Fixes #2098) 2014-01-05 04:30:19 +01:00
Philipp Hagemeister
aff24732b9 Merge remote-tracking branch 'rzhxeo/blip' 
Conflicts:
	youtube_dl/extractor/bliptv.py
 2014-01-05 03:48:45 +01:00
Philipp Hagemeister
cefcb9fde3 [bliptv] Use centralized format sorting 
This also makes youtube-dl use the better "Source" format by default.
 2014-01-05 03:21:23 +01:00
Philipp Hagemeister
bca4e93076 [bliptv] Simplify 2014-01-05 03:18:45 +01:00
Philipp Hagemeister
67c20aebb7 Merge remote-tracking branch 'rzhxeo/blip2' 2014-01-05 03:16:19 +01:00
Philipp Hagemeister
448711e39f [pornhd] Add support for ISO-3166 subpages (Fixes #2088) 2014-01-05 03:13:10 +01:00
Philipp Hagemeister
7c0578dc86 [collegehumor] Use character strings by default 2014-01-05 03:07:15 +01:00
Philipp Hagemeister
55033ffb0a [collegehumor] Add support for age_limit 2014-01-05 03:03:15 +01:00
Philipp Hagemeister
b4a9bf701a [collegehumor] Support multiple formats (Fixes #2092) 
Unfortunately, we lose a part of the description in the new JSON format, but that's still better than a non-functioning URL.
 2014-01-05 02:50:10 +01:00
Philipp Hagemeister
a7c26e7338 [lynda] minor changes 2014-01-03 13:24:29 +01:00
Philipp Hagemeister
85689a531f [macgamestore] Minor fixes (#2044) 2014-01-03 13:09:39 +01:00
Philipp Hagemeister
cc14dfb8ec Merge remote-tracking branch 'dstftw/macgamestore' 2014-01-03 13:06:22 +01:00
Philipp Hagemeister
9887c9b2d6 [jpopsuki] Simplify 2014-01-03 12:51:37 +01:00
Philipp Hagemeister
d2fee313ec Merge remote-tracking branch 'diffycat/jpopsuki' 2014-01-03 12:20:18 +01:00
Jaime Marquínez Ferrándiz
71cd2a571e [dreisat] Make ‘index.php’ optional in the url (fixes #2080) 2014-01-03 12:02:08 +01:00
Jaime Marquínez Ferrándiz
31c1cf5a9d [soundcloud] recognize more players’ urls (fixes #2078) 2014-01-02 16:18:51 +01:00
Jaime Marquínez Ferrándiz
efa1739b74 [comedycentral] Recognize ‘video-collections’ urls (#2072) 2014-01-01 21:11:35 +01:00
Jaime Marquínez Ferrándiz
5ffecde73f [mixcloud] Fix track url transformation (fixes #2068) 
‘/previews/‘ must be replaced with ‘/c/originals/‘ now.
 2014-01-01 21:07:55 +01:00
Philipp Hagemeister
08d13955dd [wistia] Prefer original video format above all others 
We could also set up a formula which would weigh filesize/bitrate and vcodec/acodec (say, 1GB h264 < 3 GB MPEG2 < 2 GB h264), but that would get really messy real soon.
 2014-01-01 20:23:49 +01:00
rzhxeo
531147dd5e [BlipTVIE] Extract all formats 2014-01-01 19:45:45 +01:00
Philipp Hagemeister
eadaf08c16 Merge remote-tracking branch 'origin/master' 2014-01-01 15:30:46 +01:00
Anton Larionov
4a9c9b6fdb [jpopsuki] Add script encoding definition for python2 2014-01-01 18:27:02 +04:00
Anton Larionov
b969ab48d9 Add support for jpopsuki.tv 2014-01-01 17:59:54 +04:00
Jaime Marquínez Ferrándiz
8fa8a6299b [youtube] Add itag 264 (closes #2063) 
It has a better bitrate than 137 but the same resolution
 2014-01-01 13:45:33 +01:00
Jaime Marquínez Ferrándiz
b2b0870b3a [dreisat] Update test filename and checksum 2014-01-01 13:30:58 +01:00
Jaime Marquínez Ferrándiz
4fb757d1e0 Merge pull request #2041 from dstftw/imdb-list 
[imdb] Add support for IMDb list (#2033)
 2014-01-01 12:45:09 +01:00
Philipp Hagemeister
33ec2ae8d9 Merge remote-tracking branch 'origin/master' 2014-01-01 10:43:58 +01:00
Jaime Marquínez Ferrándiz
c801b2051a Add an extractor for cmt.com (closes #2049) 
It just inherits from MTVIE.
Some videos also come from vevo.com
 2013-12-31 17:21:44 +01:00
rzhxeo
19dab5e6cc [GenericIE] Outsource embedded blip.tv player video id extraction to BlipTVIE and fix minor errors in RegEx 2013-12-30 06:15:02 +01:00
rzhxeo
c0f9969b9e [BlipTVIE] Fix and simplify extraction of embedded videos 2013-12-30 06:14:10 +01:00
Philipp Hagemeister
c1d1facd06 [generic] Output something before making network requests 2013-12-27 08:38:42 +01:00
Philipp Hagemeister
5d4f3985be Document that format_id field should be present 2013-12-26 21:19:00 +01:00
Philipp Hagemeister
360babf799 [theplatform] Use centralized sorting 2013-12-26 21:18:18 +01:00
Philipp Hagemeister
a1b92edbb3 [channel 9] Use centralized format sorting 2013-12-26 21:14:43 +01:00
Philipp Hagemeister
12c978739a [internetvideoarchive] Use centralized format sorting 2013-12-26 21:08:52 +01:00
Philipp Hagemeister
4bc60dafeb [blinkx] Use centralized format sorting 2013-12-26 21:05:30 +01:00
Philipp Hagemeister
bf5b0a1bfb [ivi] Use centralized format sorting 2013-12-26 18:40:16 +01:00
Philipp Hagemeister
bfe9de8510 [youporn] Add support for multiple formats 2013-12-26 18:37:12 +01:00
Philipp Hagemeister
5ecd3c6a09 [bandcamp] Add support for multiple formats 2013-12-26 14:08:57 +01:00
Philipp Hagemeister
608d11f515 [cnn] Add multiple formats, duration, and upload_date 2013-12-26 13:49:44 +01:00
dst
c7f8537dd9 [lynda] Add support for lynda.com (#1966) 2013-12-26 15:48:24 +07:00
Philipp Hagemeister
723f839911 Remove unused imports 2013-12-25 15:33:19 +01:00
Philipp Hagemeister
61224dbcdd [zdf] Make width extraction more robust 2013-12-25 15:33:09 +01:00
Philipp Hagemeister
c3afc93a69 Merge remote-tracking branch 'origin/master' 2013-12-25 15:24:44 +01:00
Philipp Hagemeister
7b8af56340 [appletrailers] Use centralized format selection 2013-12-25 15:24:41 +01:00
Philipp Hagemeister
539179f45b [wistia] Use centralized sorting 2013-12-25 15:20:14 +01:00
Philipp Hagemeister
7217e148fb [yahoo] Use centralized sorting, and add tbr field 2013-12-25 15:18:40 +01:00
dst
1e923b0d29 [macgamestore] Add extractor (#2043) 2013-12-25 16:07:34 +07:00
dst
f7e9d77f34 [smotri] Fix typo 2013-12-25 09:02:35 +07:00
dst
c645c7658d [imdb] Extractor for lists (#2033) 2013-12-25 08:34:41 +07:00
Philipp Hagemeister
b874fe2da8 [mdr] Use centralized format selection 2013-12-24 23:34:11 +01:00
Philipp Hagemeister
c7deaa4c74 [zdf] Use centralized sorting 2013-12-24 23:32:04 +01:00
Philipp Hagemeister
e6812ac99d [spiegel] Use centralized sorting 2013-12-24 12:40:23 +01:00
Philipp Hagemeister
719d3927d7 [mit] Add support for multiple formats 2013-12-24 12:38:08 +01:00
Philipp Hagemeister
55e663a8d7 [dreisat] Use centralized format sorting 2013-12-24 12:35:08 +01:00
Philipp Hagemeister
2c62dc26c8 [youtube] Simplify format specification 2013-12-24 12:34:09 +01:00
Philipp Hagemeister
4bcc7bd1f2 Add temporary _sort_formats helper function 2013-12-24 12:31:42 +01:00
Philipp Hagemeister
f49d89ee04 Add a resolution field and improve general --list-formats output 2013-12-24 11:56:02 +01:00
Philipp Hagemeister
dabc127362 Remove dead code 2013-12-23 16:03:06 +01:00
Philipp Hagemeister
f45f96f8f8 [myvideo] Use RTMP instead of RTMPT (Fixes #2032) 2013-12-23 15:57:43 +01:00
Philipp Hagemeister
1538eff6d8 [bliptv] Remove support for direct downloads 
This is now handled by the generic IE
 2013-12-23 15:49:21 +01:00
Philipp Hagemeister
d80044c235 [youtube] Prefer videos with sound 2013-12-23 04:51:42 +01:00
Philipp Hagemeister
f82b18efc1 Merge remote-tracking branch 'rzhxeo/youtube' 2013-12-23 04:37:40 +01:00
Philipp Hagemeister
466617f539 [bliptv] Simplify (From #2000) 2013-12-23 04:31:38 +01:00
Philipp Hagemeister
7dbf5ae587 [smotri] Add support for moderated (?) videos (Fixes #2030) 2013-12-23 03:44:47 +01:00
Philipp Hagemeister
8d0bdeba18 [smotri] Make optional attributes optional 2013-12-23 03:38:29 +01:00
Philipp Hagemeister
1b969041d7 [blinkx] Support mobile URLs (Closes #2022) 2013-12-22 07:43:54 +01:00
Philipp Hagemeister
e302f9ce32 [youtube:user] Speed up --match-title 2013-12-22 03:57:42 +01:00
Philipp Hagemeister
7115ca84aa [vimeo/generic] Add support for embedded SWF vimeo videos 2013-12-22 03:34:13 +01:00
Philipp Hagemeister
bbafbe20c2 [vimeo] Better formatting for regexp 2013-12-22 03:21:28 +01:00
Philipp Hagemeister
c4d55a33fc [brightcove] Test checksum changed 2013-12-20 17:28:50 +01:00
Philipp Hagemeister
147e4aece0 [vbox7] New video checksum 2013-12-20 17:27:43 +01:00
Philipp Hagemeister
bd1488ae64 [mdr] Remove test 
For context, refer to the http://de.wikipedia.org/wiki/Depublizieren
 2013-12-20 17:24:48 +01:00
Philipp Hagemeister
79fed2a4df [crunchyroll] Fix test (#1721) 2013-12-20 17:20:39 +01:00
Philipp Hagemeister
304cbe981e Merge remote-tracking branch 'rzhxeo/crunchyroll' 2013-12-20 17:13:26 +01:00
Philipp Hagemeister
3fefbf50e3 Merge pull request #2005 from dstftw/ivi.ru 
Add support for ivi.ru
 2013-12-20 08:12:38 -08:00
Philipp Hagemeister
aa94a6d315 [aparat] Add support (Fixes #2012) 2013-12-20 17:05:39 +01:00
Jaime Marquínez Ferrándiz
768df74538 [blinkxx] Add support for youtube videos 2013-12-19 21:02:25 +01:00
Philipp Hagemeister
1f9da9049b [generic] Support YouTube swf embed (Fixes #2010) 2013-12-19 20:44:30 +01:00
Jaime Marquínez Ferrándiz
c0d0b01f0e [generic] Detect ooyala videos (fixes #2013) 2013-12-19 20:32:12 +01:00
dst
97e302a419 [imdb] Add support for mobile site URLs 2013-12-20 00:21:04 +07:00
Philipp Hagemeister
71507a11c8 [soundcloud] Support mobile URLs (Fixes #2009) 2013-12-19 16:39:01 +01:00
dst
a51e37af62 [ivi] Simplify 2013-12-19 10:53:38 +07:00
dst
6c6db72ed4 [ivi] Skip tests for travis build 2013-12-19 06:19:41 +07:00
dst
0cc83dc54b [smotri] Fix duration field name 2013-12-19 05:56:48 +07:00
dst
77aa6b329d [ivi] Add support for ivi.ru 2013-12-19 05:28:16 +07:00
rzhxeo
e56f22ae20 [YoutubeIE] Sort formats by resolution 2013-12-18 21:22:37 +01:00
rzhxeo
dbd1988ed9 [YoutubeIE] Add width and height to format dict 2013-12-18 21:21:25 +01:00
rzhxeo
4ea3be0a5c [YoutubeIE] Externalize format selection 2013-12-18 03:30:55 +01:00
Philipp Hagemeister
3e78514568 [generic] Support application/ogg for direct links 
Also remove some debugging code.
 2013-12-17 16:26:34 +01:00
Philipp Hagemeister
7de6e075b4 [radiofrance] remove unused imports 2013-12-17 12:35:16 +01:00
Philipp Hagemeister
946135aa2a [academicearth] remove unused imports 2013-12-17 12:34:30 +01:00
Philipp Hagemeister
42393ce234 Add support for direct links to a video (#1973) 2013-12-17 12:33:55 +01:00
Philipp Hagemeister
cecaaf3f58 [generic] Do not use compatibility result fallback 2013-12-17 12:04:33 +01:00
Philipp Hagemeister
46374a56b2 [youtube] Do not warn for videos with allow_rating=0 
This fixes #1982
Test video: http://www.youtube.com/watch?v=gi2uH3YxohU
 2013-12-17 02:49:56 +01:00
Philipp Hagemeister
ec98946ef9 [academicearth] Support playlists (Closes #1976) 2013-12-17 02:41:34 +01:00
Philipp Hagemeister
fa77b742ac [radiofrance] Fill in test details 2013-12-16 23:07:57 +01:00
Philipp Hagemeister
8b4e274610 [rtlnow] Fix URL calculation (Closes #1989) 2013-12-16 22:28:52 +01:00
Philipp Hagemeister
88bb52ee18 Merge branch 'master' of github.com:rg3/youtube-dl 2013-12-16 22:18:37 +01:00
Philipp Hagemeister
d90df974c3 [academicearth] Add support for courses (#1976) 2013-12-16 22:18:27 +01:00
Jaime Marquínez Ferrándiz
5c541b2cb7 [mtv] Add support for urls from the mobile site (fixes #1959) 2013-12-16 22:05:28 +01:00
Itay Brandes
87a28127d2 _search_regex's "isatty" call fails with Py2exe's 
_search_regex calls the sys.stderr.isatty() function for unix systems.

Py2exe uses a custom Stderr() stream which doesn't have an `isatty()`
function, leading to it's crash.

Fixes easily with checking that it's a unix system first.
 2013-12-16 21:50:26 +01:00
Philipp Hagemeister
ebce53b3d8 [vevo] Add suppor for videoplayer. URLs (#1957) 2013-12-16 21:48:38 +01:00
Philipp Hagemeister
ff07a05575 Merge branch 'master' of github.com:rg3/youtube-dl 2013-12-16 21:46:11 +01:00
Philipp Hagemeister
f25571ffbf Add support for embedded vevo player (Fixes #1957) 2013-12-16 21:45:21 +01:00
Jaime Marquínez Ferrándiz
f7a6892572 [arte:ddc] Remove test 
video seems to expire in 7 days, as arte+7
 2013-12-16 21:42:41 +01:00
Philipp Hagemeister
0e2a436dce [radiofrance] Add support (Fixes #1942) 2013-12-16 21:34:41 +01:00
Philipp Hagemeister
8c8e3eec79 [facebook] Recognize #! URLs (Fixes #1988) 2013-12-16 21:10:06 +01:00
rzhxeo
ee3e63e477 [GenericIE] Add support for embedded blip.tv 2013-12-16 20:08:23 +01:00
Philipp Hagemeister
780603027f [videopremium] Skip test 2013-12-16 14:42:07 +01:00
Philipp Hagemeister
d67b0b1596 Reorder info_dict documentation 2013-12-16 14:13:40 +01:00
Philipp Hagemeister
d7dda16888 [blinkx] Add extractor (Fixes #1972) 2013-12-16 13:56:30 +01:00
Philipp Hagemeister
d66152a898 [ndtv] Remove unused imports 2013-12-16 08:16:38 +01:00
Philipp Hagemeister
8c5f0c9fbc [mdr] Clean up 2013-12-16 08:16:11 +01:00
Philipp Hagemeister
09dacfa57f [mdr] Simplify 2013-12-16 05:44:34 +01:00
Philipp Hagemeister
b2ae513586 Merge remote-tracking branch 'mc2avr/master' 2013-12-16 05:14:03 +01:00
Philipp Hagemeister
e4a0489f6e Merge remote-tracking branch 'dstftw/channel9' 
Conflicts:
	youtube_dl/extractor/__init__.py
 2013-12-16 05:14:00 +01:00
Philipp Hagemeister
6f5dcd4eee [pornhd] Simplify 2013-12-16 05:10:42 +01:00
Philipp Hagemeister
1bb2fc98e0 Merge remote-tracking branch 'mjorlitzky/master' 2013-12-16 05:07:58 +01:00
Philipp Hagemeister
c0ba0f4859 Document duration field 2013-12-16 04:09:43 +01:00
Philipp Hagemeister
b466b7029d [youtube] Make duration an integer or None 2013-12-16 04:09:05 +01:00
Philipp Hagemeister
fa3ae234e0 [cbs] Add extractor (Fixes #1977) 2013-12-16 03:53:43 +01:00
Philipp Hagemeister
48462108f3 [theplatform] Fix geographic restriction check 2013-12-16 03:43:45 +01:00
Philipp Hagemeister
f8b56e95b8 [theplatform] Detect geoblocked content 2013-12-16 03:34:46 +01:00
Jaime Marquínez Ferrándiz
9ee859b683 [daylimotion] Add support for urls from the mobile site (fixes #1953) 
It uses the 'touch' subdomain and adds a '#' before 'video'
 2013-12-14 14:20:12 +01:00
Michael Orlitzky
8e05c870b4 Add support for pornhd.com. 2013-12-13 22:24:32 -05:00
Jaime Marquínez Ferrándiz
5d574e143f [ign] Update one of test video's title 2013-12-13 17:04:40 +01:00
Jaime Marquínez Ferrándiz
7a563df90a [daum] Recognize mobile urls (#1952) 2013-12-12 13:05:38 +01:00
Jaime Marquínez Ferrándiz
24b173fa5c [naver] Recognize mobile urls (fixes #1951) 2013-12-12 13:04:02 +01:00
dst
9b17ba0fa5 [channel9] Fix test description md5 2013-12-12 16:10:17 +07:00
dst
211f555d4c [channel9] Missing import in __init__ 2013-12-12 15:55:31 +07:00
dst
4d2ebb6bd7 [channel9] Cleanup 2013-12-12 15:19:23 +07:00
dst
df53747436 [channel9] Initial implementation (#1885) 2013-12-12 15:13:45 +07:00
Philipp Hagemeister
00381b4ccb [pornhub] Fix URL regexp 2013-12-11 09:22:08 +01:00
Jaime Marquínez Ferrándiz
1825836235 Use _download_xml in more extractors 2013-12-10 21:03:53 +01:00
Jaime Marquínez Ferrándiz
a0088bdf93 [vimeo] Fix unused argument of the _real_extract method 2013-12-10 20:43:16 +01:00
Jaime Marquínez Ferrándiz
48ad51b243 [vimeo] Fix the extraction for some 'player' or 'pro' videos 
The variable the config dict is assigned to can change, now we try to detect it or fallback to a, b or c
 2013-12-10 20:28:12 +01:00
Jaime Marquínez Ferrándiz
5458b4cefb [dailymotion] Fix view count extraction and make it non fatal (fixes #1940) 2013-12-10 19:47:00 +01:00
Jaime Marquínez Ferrándiz
7c86cd5ab1 [dailymotion] Fix uploader extraction 
Now it looks directly in the info dictionary
 2013-12-10 19:44:16 +01:00
mc2avr
df1d7da2af add MDRIE 2013-12-10 18:40:50 +01:00
Jaime Marquínez Ferrándiz
cbfc470228 [mixcloud] Try to get the m4a url if the mp3 url fails to download (fixes #1939) 2013-12-10 13:42:41 +01:00
Jaime Marquínez Ferrándiz
f67ca84d4a [soundcloud] Fix the extension for 'downloadable' songs 
In this case the 'original_format' field must be used.
 2013-12-10 13:04:21 +01:00
Philipp Hagemeister
e2b38da931 [mtv] Fixup incorrectly encoded XML documents 2013-12-10 12:45:22 +01:00
Philipp Hagemeister
5a3ea17c94 [zdf] Correct order of unknown formats (#1936) 2013-12-10 11:52:10 +01:00
Philipp Hagemeister
475700acfe [soundcloud] Do not mistake original_format for ext (Fixes #1934) 2013-12-10 11:45:13 +01:00
Philipp Hagemeister
f8bd0194a7 Remove superfluous spaces 2013-12-09 20:05:10 +01:00
Jaime Marquínez Ferrándiz
77526143e7 [brightcove] Use the original url (usually the player) as the default referer (fixes #1929) 2013-12-09 20:01:43 +01:00
Philipp Hagemeister
4ff50ef846 [soundcloud] Do not match sets (Fixes #1930) 2013-12-09 19:57:00 +01:00
Philipp Hagemeister
caefb1de87 [ndtv] Add extractor (Fixes #1924) 2013-12-09 19:44:33 +01:00
Philipp Hagemeister
1d87e3a1c6 [rtlnow] Allow double slashes after domain name (Fixes #1928) 2013-12-09 18:56:05 +01:00
Jaime Marquínez Ferrándiz
de2dd4c502 [soundcloud] add support for private links (fixes #1927) 2013-12-09 17:08:58 +01:00
Philipp Hagemeister
2101830c0d Remove unused imports 2013-12-09 04:53:23 +01:00
Philipp Hagemeister
ffa8f0df0a Merge remote-tracking branch 'jaimeMF/yt-toplists' 2013-12-09 04:49:32 +01:00
Philipp Hagemeister
693b8b2d31 Merge remote-tracking branch 'dstftw/smotri.com-broadcast' 
Conflicts:
	youtube_dl/FileDownloader.py
	youtube_dl/extractor/smotri.py
 2013-12-09 04:42:35 +01:00
Philipp Hagemeister
7cc3570e53 Add fatal=False parameter to _download_* functions. 
This allows us to simplify the calls in the youtube extractor even further.
 2013-12-09 01:49:03 +01:00
Jaime Marquínez Ferrándiz
baa7b1978b Remove the calls to 'compat_urllib_request.urlopen' in a few extractors 2013-12-08 22:24:55 +01:00
Jaime Marquínez Ferrándiz
ac5118bcb9 [arte.tv:ddc] Add fields to the test and skip download (rtmp) 2013-12-08 16:35:29 +01:00
Camillo Dell'mour
52defb0c9b made ddc.arte.tv test working 2013-12-08 16:22:31 +01:00
Camillo Dell'mour
56a8ab7d60 added arte.tv extractor support for subdomain ddc - Mit offenen Karten(german) Le Dessous des Cartes(france) 2013-12-08 14:43:15 +01:00
Philipp Hagemeister
31812a9e0e [youtube:channel] Fix automated channel detection 2013-12-08 07:30:42 +01:00
Philipp Hagemeister
11bf848191 [wimp] simplify 2013-12-08 07:22:19 +01:00
rzhxeo
b860967ce4 [XHamsterIE] Fix md5 in second test 2013-12-07 22:17:13 +01:00
rzhxeo
8ca6b8fba1 [XHamsterIE] Fix HD video detection 2013-12-07 21:39:32 +01:00
Jaime Marquínez Ferrándiz
c4d9e6731a [pyvideo] add support for videos that don't come from Youtube 2013-12-07 11:19:59 +01:00
Jaime Marquínez Ferrándiz
0d9ec5d963 [pyvideo] Cleanup and fix test 2013-12-07 11:00:56 +01:00
Adam Glenn
f623530d6e removing bad VALID_URL 2013-12-06 21:12:10 -08:00
Adam Glenn
ca9e02dc00 Adding pyvideo support 2013-12-06 21:11:01 -08:00
Jaime Marquínez Ferrándiz
fb30ec22fd [vimeo] Add an extractor for groups 2013-12-06 22:01:41 +01:00
Jaime Marquínez Ferrándiz
5cc14c2fd7 [vimeo] Add an extractor for albums (closes #1911) 2013-12-06 21:48:44 +01:00
Jaime Marquínez Ferrándiz
d349cd2240 [imdb] Fix extraction 
The paths to each format's page may have leading whitespace.
The height and the duration can't be extracted.
 2013-12-06 20:26:55 +01:00
Jaime Marquínez Ferrándiz
0b6a9f639f [vevo] Update test video's duration 2013-12-06 20:14:29 +01:00
Jaime Marquínez Ferrándiz
715c8e7bdb [youtube:playlist] Recognize mix ids for direct use (fixes #1295) 2013-12-06 19:52:41 +01:00
Jaime Marquínez Ferrándiz
7d4afc557f [youtube:playlist] Support mix ids longer than 13 (#1295) 2013-12-06 19:48:54 +01:00
Jaime Marquínez Ferrándiz
563e405411 [dailymotion] Fix view count regex 
In some languages they can be in the format '123,456' instead of '123.456'
 2013-12-06 13:41:07 +01:00
Jaime Marquínez Ferrándiz
f53c966a73 [dailymotion] Extract view count (#1895) 2013-12-06 13:36:36 +01:00
Jaime Marquínez Ferrándiz
336c3a69bd [youtube] Extract like and dislike count (#1895) 2013-12-06 13:22:27 +01:00
Jaime Marquínez Ferrándiz
4e76179476 [vimeo] Extract views count, likes count and comments count (#1895) 2013-12-06 13:03:08 +01:00
Philipp Hagemeister
ef4fd84857 [wistia] Add extractor 2013-12-06 09:15:04 +01:00
Philipp Hagemeister
72135030d1 Merge remote-tracking branch 'origin/master' 2013-12-05 22:30:04 +01:00
Jaime Marquínez Ferrándiz
3514813d5b [francetv] Add support for urls in the format http://www.france3.fr/emissions/{program}/diffusions/{date} (fixes #1898) 2013-12-05 21:49:30 +01:00
Jaime Marquínez Ferrándiz
9e60602084 [francetv] Add support for more channels: 3, 4, 5 and Ô (#1898) 
Rename the France2IE extractor to FranceTVIE
 2013-12-05 21:48:41 +01:00
Philipp Hagemeister
19e3dfc9f8 [9gag] Like/dislike count (#1895) 2013-12-05 18:29:07 +01:00
Philipp Hagemeister
a1ef7e85d6 Remove unused imports 2013-12-05 14:31:54 +01:00
Philipp Hagemeister
ef2fac6f4a Merge branch 'master' of github.com:rg3/youtube-dl 2013-12-05 14:29:14 +01:00
Philipp Hagemeister
7fc3fa0545 [9gag] Add extractor 2013-12-05 14:29:08 +01:00
Jaime Marquínez Ferrándiz
673d1273ff [vevo] Support '/watch/{id}' urls 2013-12-05 12:41:58 +01:00
Jaime Marquínez Ferrándiz
b9a2c53833 [metacafe] Add support for cbs videos (fixes #1838) 
They use theplatform.com
 2013-12-04 23:43:50 +01:00
Jaime Marquínez Ferrándiz
e9bf7479d2 Add an extractor for theplatform.com 2013-12-04 23:41:22 +01:00
Jaime Marquínez Ferrándiz
bfb9f7bc4c [hotnewhiphop] Update test's title 2013-12-04 20:36:26 +01:00
Philipp Hagemeister
29030c0a4c Merge remote-tracking branch 'dstftw/correct-valid-urls' 2013-12-04 19:56:05 +01:00
dst
c0ade33e16 Correct some extractor _VALID_URL regexes 2013-12-04 20:34:47 +07:00
Philipp Hagemeister
27dcce1904 [youtube] Resolve URLs in comments 2013-12-04 14:18:49 +01:00
dst
8aff7b9bc4 [smotri] Fix broadcast ticket regex 2013-12-04 12:36:12 +07:00
dst
55f6597c67 [smotri] Add an extractor for live rtmp broadcasts 2013-12-04 08:41:09 +07:00
Jaime Marquínez Ferrándiz
84db81815a Move common code for extractors based in MTV services to a new base class 
Removes the duplication of the thumbnail extraction code (only MTVIE needs to override it)
 2013-12-03 14:58:24 +01:00
Jaime Marquínez Ferrándiz
fb7abb31af Remove the compatibility code used before the new format system was implemented 2013-12-03 14:31:20 +01:00
Philipp Hagemeister
ce93879a9b [daum] Fix real video ID extraction 2013-12-03 14:16:58 +01:00
Philipp Hagemeister
938384c587 [redtube] Fix search for title 2013-12-03 14:08:16 +01:00
Philipp Hagemeister
e9d8e302aa [xhamster] Change test checksum 2013-12-03 14:06:16 +01:00
Jaime Marquínez Ferrándiz
cb7fb54600 Change the ie_name of YoutubeSearchDateIE 
It produced a duplicate entry when listing the extractors with '--list-extractors' and generates noise in the commit log when generating the supported sites webpage (like in 09f355f73b)
 2013-12-03 13:55:25 +01:00
Philipp Hagemeister
aaebed13a8 [smotri] Simplify 2013-12-02 17:08:17 +01:00
dst
5270d8cb13 Added extractors for smotri.com 2013-12-02 20:10:19 +07:00
Jaime Marquínez Ferrándiz
55a10eab48 [vimeo] Add an extractor for users (closes #1871) 2013-12-01 22:36:18 +01:00
Philipp Hagemeister
355e4fd07e [generic] Find embedded dailymotion videos (Fixes #1848) 2013-12-01 01:21:33 +01:00
Philipp Hagemeister
5e09d6abbd [clipfish] Skip test on travis 2013-12-01 01:16:20 +01:00
Jaime Marquínez Ferrándiz
0a688bc0b2 [youtube] Add support for downloading top lists (fixes #1868) 
It needs to know the channel and the title of the list, because the ids change every time you browse the channels and are attached to a 'VISITOR_INFO1_LIVE' cookie.
 2013-11-30 14:56:51 +01:00
Jaime Marquínez Ferrándiz
c5171c454b [yahoo] Force use of the http protocol for downloading the videos. 2013-11-29 22:06:17 +01:00
Jaime Marquínez Ferrándiz
befd88b786 [yahoo] Add an extractor for yahoo news (closes #1849) 2013-11-29 15:25:43 +01:00
Jaime Marquínez Ferrándiz
acf37ca151 [imdb] Fix the resolution values (fixes #1847) 
We were using the size of the player, it was the same for all the formats
 2013-11-29 07:56:14 +01:00
Philipp Hagemeister
677c18092d [podomatic] Add extractor 2013-11-29 03:33:25 +01:00
Jaime Marquínez Ferrándiz
3862402ff3 Add an extractor for Clipsyndicate (closes #1744) 2013-11-28 14:38:10 +01:00
Jaime Marquínez Ferrándiz
b03d0d064c [imdb] Fix extraction in python 2.6 
Using a regular expression because the html cannot be parsed.
 2013-11-28 13:49:00 +01:00
Jaime Marquínez Ferrándiz
d8d6148628 Add an extractor for Internet Movie Database trailers (closes #1832) 2013-11-28 13:32:49 +01:00
Philipp Hagemeister
fc9e1cc697 [clipfish] Use FIFA trailer as testcase (#1842) 2013-11-28 06:10:37 +01:00
Philipp Hagemeister
f8f60d2793 [clipfish] Fix imports (#1842) 2013-11-28 05:54:46 +01:00
Philipp Hagemeister
2a275ab007 [zdf] Use _download_xml 2013-11-28 05:47:50 +01:00
Philipp Hagemeister
a2e6db365c [zdf] add a pseudo-testcase and fix URL matching 2013-11-28 05:47:20 +01:00
Philipp Hagemeister
9d93e7da6c Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-28 04:37:02 +01:00
Jaime Marquínez Ferrándiz
0e44d8381a [youtube:feeds] Use the 'paging' value from the downloaded json information (fixes #1845) 2013-11-28 00:33:27 +01:00
Jaime Marquínez Ferrándiz
35907e23ec [yahoo] Fix video extraction and use the new format system exclusively 2013-11-27 21:24:55 +01:00
Jaime Marquínez Ferrándiz
76d1700b28 [youtube:playlist] Fix the extraction of the title for some mixes (#1844) 
Like https://www.youtube.com/watch?v=g8jDB5xOiuE&list=RDIh2gxLqR7HM
 2013-11-27 20:01:51 +01:00
Philipp Hagemeister
dcca796ce4 [clipfish] Effect a better error message (#1842) 2013-11-27 18:33:51 +01:00
Filippo Valsorda
4b19e38954 [videopremium] support new .me domain 2013-11-27 02:54:51 +01:00
Jaime Marquínez Ferrándiz
652cdaa269 [youtube:playlist] Add support for YouTube mixes (fixes #1839) 2013-11-26 21:35:03 +01:00
Jaime Marquínez Ferrándiz
e26f871228 Use the new '_download_xml' helper in more extractors 2013-11-26 19:17:25 +01:00
Jaime Marquínez Ferrándiz
6e47b51eef [youtube:playlist] Remove the link with index 0 
It's not the first video of the playlist, it appears in the 'Play all' button (see the test course for an example)
 2013-11-26 19:09:14 +01:00
Philipp Hagemeister
fb04e40396 [soundcloud] Support for listing of audio-only files 2013-11-25 22:34:56 +01:00
Philipp Hagemeister
8b134b1062 Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-25 22:16:07 +01:00
Jaime Marquínez Ferrándiz
1a62c18f65 [bambuser] Skip the download in the test 
It doesn't respect the 'Range' header.
 2013-11-25 22:03:20 +01:00
Philipp Hagemeister
2a15e7063b [soundcloud] Prefer HTTP over RTMP (#1798) 2013-11-25 20:30:41 +01:00
Philipp Hagemeister
ea36cbac5e Merge remote-tracking branch 'rbrito/swap-dimensions' 2013-11-25 06:19:15 +01:00
Philipp Hagemeister
de79c46c8f [viki] Fix subtitle extraction 2013-11-25 06:06:18 +01:00
Philipp Hagemeister
94ccb6fa2e [viki] Fix subtitles extraction 2013-11-25 05:58:04 +01:00
Philipp Hagemeister
07e4035879 [viki] Fix uploader extraction 2013-11-25 05:57:55 +01:00
Philipp Hagemeister
113577e155 [generic] Improve detection 
Allow download of http://goo.gl/7X5tOk
Fixes #1818
 2013-11-25 03:35:53 +01:00
Philipp Hagemeister
79d09f47c2 Merge branch 'opener-to-ydl' 2013-11-25 03:30:37 +01:00
Philipp Hagemeister
c059bdd432 Remove quality_name field and improve zdf extractor 2013-11-25 03:28:55 +01:00
Philipp Hagemeister
02dbf93f0e [zdf/common] Use API in ZDF extractor. 
This also comes with a lot of extra format fields
Fixes #1518
 2013-11-25 03:13:22 +01:00
Philipp Hagemeister
1fb2bcbbf7 [viki] Make uploader field optional (#1813) 2013-11-25 02:02:34 +01:00
Jaime Marquínez Ferrándiz
66cfab4226 [comedycentral] Add support for comedycentral.com videos (closes #1824) 
It's a subclass of MTVIE

The extractor for colbertnation.com and thedailyshow.com is called now ComedyCentralShowsIE
 2013-11-24 21:18:35 +01:00
Philipp Hagemeister
6d88bc37a3 [viki] Skip travis test 
Also provide a better error message for geoblocked videos.
 2013-11-24 15:28:50 +01:00
Philipp Hagemeister
b7553b2554 [vik] Clarify output 2013-11-24 15:20:16 +01:00
Philipp Hagemeister
e03db0a077 Merge branch 'master' into opener-to-ydl 2013-11-24 15:18:44 +01:00
Jaime Marquínez Ferrándiz
267ed0c5d3 [collegehumor] Encode the xml before calling xml.etree.ElementTree.fromstring (fixes #1822) 
Uses a new helper method in InfoExtractor: _download_xml
 2013-11-24 14:59:19 +01:00
Jaime Marquínez Ferrándiz
f459d17018 [youtube] Add an extractor for downloading the watch history (closes #1821) 2013-11-24 14:33:50 +01:00
Jaime Marquínez Ferrándiz
dc65dcbb6d [mixcloud] The description field may be missing (fixes #1819) 2013-11-24 11:28:44 +01:00
Jaime Marquínez Ferrándiz
d214fdb8fe [brightcove] Don't use 'or' with the xml nodes, use the 'value' attribute instead 2013-11-24 11:02:34 +01:00
Philipp Hagemeister
0c7c19d6bc [clipfish] Add extractor (Fixes #1760) 2013-11-24 07:51:44 +01:00
Philipp Hagemeister
382ed50e0e [viki] Add extractor (fixes #1813) 2013-11-24 07:30:05 +01:00
Philipp Hagemeister
66ec019240 [youtube] do not use variable name twice 2013-11-24 06:54:26 +01:00
Philipp Hagemeister
bd49928f7a [niconico] Clarify download 2013-11-24 06:53:50 +01:00
Philipp Hagemeister
23e6d50d73 [bandcamp] Remove unused variable 2013-11-24 06:52:53 +01:00
Philipp Hagemeister
13ebea791f [niconico] Simplify and make work with old Python versions 
The website requires SSLv3, otherwise it just times out during SSL negotiation.
 2013-11-24 06:39:10 +01:00
Philipp Hagemeister
4c9c57428f Merge remote-tracking branch 'takuya0301/niconico' 2013-11-24 06:09:11 +01:00
Jaime Marquínez Ferrándiz
36de0a0e1a [brightcove] Set the 'videoPlayer' value to the 'videoId' if it's missing in the parameters (fixes #1815) 2013-11-23 23:27:15 +01:00
Philipp Hagemeister
e5c146d586 [streamcloud] skip test on travis 2013-11-23 15:57:42 +01:00
Takuya Tsuchida
52ad14aeb0 Add support for niconico 2013-11-23 18:19:44 +09:00
Philipp Hagemeister
081640940e Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-22 22:46:57 +01:00
Philipp Hagemeister
7012b23c94 Match --download-archive during playlist processing (Fixes #1745) 2013-11-22 22:46:46 +01:00
Jaime Marquínez Ferrándiz
9f79463803 [howcast] update test's checksum 2013-11-22 21:25:12 +01:00
Jaime Marquínez Ferrándiz
d35dc6d3b5 [bandcamp] move the album test to the album extractor and return a single track instead of a playlist 2013-11-22 21:19:31 +01:00
Philipp Hagemeister
3f8ced5144 Merge remote-tracking branch 'jaimeMF/yt-playlists' 2013-11-22 20:11:54 +01:00
Philipp Hagemeister
dca0872056 Move the opener to the YoutubeDL object. 
This is the first step towards being able to just import youtube_dl and start using it.
Apart from removing global state, this would fix problems like #1805.
 2013-11-22 19:57:52 +01:00
Philipp Hagemeister
15c3adbb16 Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-22 19:08:33 +01:00
Philipp Hagemeister
f143a42fe6 [bandcamp] Skip album test 2013-11-22 19:08:25 +01:00
Jaime Marquínez Ferrándiz
241650c7ff [vimeo] Fix the extraction of vimeo pro and player.vimeo.com videos 2013-11-22 18:20:31 +01:00
Philipp Hagemeister
cffa6aa107 [bandcamp] Support trackinfo-style songs (Fixes #1270) 2013-11-22 17:44:55 +01:00
Philipp Hagemeister
02e4ebbbad [streamcloud] Add IE (Fixes #1801) 2013-11-22 17:19:22 +01:00
Philipp Hagemeister
ab009f59ef [toutv] Fix a typo 2013-11-22 17:18:03 +01:00
Jaime Marquínez Ferrándiz
0980426559 [bandcamp] add support for albums (reported in #1270) 2013-11-22 16:05:14 +01:00
Jaime Marquínez Ferrándiz
64bb5187f5 [soundcloud] Retrieve the file url using the client_id for the iPhone (fixes #1798) 
The desktop's client_id always give the rtmp url, but with the iPhone one it returns the http url if it's available.
 2013-11-21 13:16:19 +01:00
Philipp Hagemeister
9e4f50a8ae [sztv] skip test, site is undergoing mid-term maintenance 2013-11-20 09:59:03 +01:00
Philipp Hagemeister
0190eecc00 [nhl] Make NHLVideocenter IE_DESC fit with other descriptions 2013-11-20 09:45:29 +01:00
Philipp Hagemeister
ca872a4c0b [spankwire] Fix description search 2013-11-20 09:23:53 +01:00
Philipp Hagemeister
f2e87ef4fa [anitube] Skip test (on travis) 2013-11-20 07:46:44 +01:00
Philipp Hagemeister
0ad97bbc05 [spankwire] fix check for description 2013-11-20 07:45:32 +01:00
Philipp Hagemeister
c4864091a1 [videopremium] Support new crazy redirect scheme 2013-11-20 07:43:21 +01:00
Philipp Hagemeister
9a98a466b3 [toutv] really skip test 2013-11-20 07:37:22 +01:00
Philipp Hagemeister
da6a795fdb [escapist] Fix title search 2013-11-20 07:23:23 +01:00
Philipp Hagemeister
c5edcde21f [escapist] upper-case URL 2013-11-20 06:56:59 +01:00
Philipp Hagemeister
15ff3c831e [escapist] Fix syntax error 2013-11-20 06:55:07 +01:00
Philipp Hagemeister
100959a6d9 [escapist] Add support for HD format (Closes #1755) 2013-11-20 06:52:08 +01:00
Philipp Hagemeister
8f05351984 [anitube] Minor fixes (#1776) 2013-11-20 06:35:02 +01:00
Philipp Hagemeister
71791f414c Merge remote-tracking branch 'diffycat/master' 2013-11-20 06:28:13 +01:00
Philipp Hagemeister
f3682997d7 Clean up unused imports and other minor mistakes 2013-11-20 06:27:48 +01:00
Philipp Hagemeister
cc13cc0251 [teamcoco] Correct error 2013-11-20 06:25:33 +01:00
Philipp Hagemeister
5904088811 Add support for tou.tv (Fixes #1792) 2013-11-20 06:13:19 +01:00
Jaime Marquínez Ferrándiz
69545c2aff [d8] inherit from CanalplusIE 
it reuses the same extraction process
 2013-11-19 20:44:20 +01:00
Jaime Marquínez Ferrándiz
495da337ae Merge pull request #1758 from migbac/master 
Add support for d8.tv
 2013-11-19 20:43:14 +01:00
Philipp Hagemeister
cb7dfeeac4 [youtube] only allow domain name to be upper-case (#1786) 2013-11-18 16:42:35 +01:00
Philipp Hagemeister
4113e6ab56 [auengine] Do not return unnecessary ext 2013-11-18 14:36:01 +01:00
Philipp Hagemeister
9906d397a0 [auengine] Simplify 2013-11-18 13:56:45 +01:00
Philipp Hagemeister
887c6acdf2 Support multiple embedded YouTube URLs (Fixes #1787) 2013-11-18 13:28:26 +01:00
Philipp Hagemeister
83aa529330 Support protocol-independent URLs (#1787) 2013-11-18 13:18:17 +01:00
Philipp Hagemeister
fccd377198 Suppor embed-only videos (Fixes #1746) 2013-11-18 13:05:18 +01:00
Philipp Hagemeister
63b7b7224a [MTVIE] Try with RTMP URL if download fails 
This fixes youtube-dl http://www.southpark.de/clips/155251/cartman-vs-the-dog-whisperer
 2013-11-17 22:11:40 +01:00
rzhxeo
746f491f82 Add support for southpark.de 2013-11-17 17:54:47 +01:00
rzhxeo
1672647ade [SouthParkStudiosIE] Move from _TEST to _TESTS 2013-11-17 17:43:58 +01:00
rzhxeo
90b6bbc38c [SouthParkStudiosIE] Also detect urls without http:// or www 2013-11-17 17:42:24 +01:00