Commit graph

2590 commits

Author SHA1 Message Date
Jaime Marquínez Ferrándiz 8f5c0218d8 [fivemin] Get the 'sid' from the embed page (fixes #2745)
It allows to download some videos that failed.
2014-04-15 16:18:37 +02:00
Sergey M․ d7666dff82 [9gag] Fix and improve extraction 2014-04-15 19:49:38 +07:00
Jaime Marquínez Ferrándiz 2d4c98dbd1 [ted] Use the rtmp links if there http downloads are not available. 2014-04-14 15:23:12 +02:00
Sergey M․ fd50bf623c [generic] Modernize tests 2014-04-14 18:56:29 +07:00
Sergey M․ d360a14678 [generic] Update test 2014-04-14 18:51:46 +07:00
Philipp Hagemeister de906ef543 [aol] Add support for playlists (Fixes #2730) 2014-04-13 03:22:24 +02:00
Sergey M․ 2fb3deeca1 [tube8] Fix extraction and modernize 2014-04-13 03:56:32 +07:00
Philipp Hagemeister 66398056f1 Merge branch 'master' of github.com:rg3/youtube-dl 2014-04-12 17:15:16 +02:00
Jaime Marquínez Ferrándiz 381640e3ac [brightcove] Only use url from meta element if it has the 'playerKey' field (fixes #2738) 2014-04-12 12:53:48 +02:00
Sergey M․ 37e3410137 [prosiebensat1] Add one more clip id pattern (Closes #2737) 2014-04-12 02:53:55 +07:00
Jaime Marquínez Ferrándiz 97b5196960 [weibo] Modernize 2014-04-11 16:02:34 +02:00
Sergey M․ 6a4f3528c8 [firstpost] Fix extraction 2014-04-11 20:40:42 +07:00
Philipp Hagemeister b9c76aa1a9 [youtube] Add support for cleanvideosearch.com (Fixes #2734) 2014-04-11 13:53:05 +02:00
Philipp Hagemeister 7753cadbfa [comedycentral:shows] Add support for TDS special editions (Fixes #2733) 2014-04-11 09:30:07 +02:00
Philipp Hagemeister 3950450342 [pyvideo] Fix title 2014-04-11 02:20:50 +02:00
Philipp Hagemeister c82b1fdad6 [slideshare] Fix description 2014-04-11 02:19:15 +02:00
Philipp Hagemeister b0fb63abe8 [dailymotion:playlist] Fix title 2014-04-11 02:16:46 +02:00
Philipp Hagemeister 3ab34c603e [comedycentral] Fix test md5sum 2014-04-11 02:14:31 +02:00
Philipp Hagemeister 4be9f8c814 [ninegag] Add support for p/ URLs 2014-04-11 01:25:24 +02:00
Sergey M․ 5c802bac37 [byutv] Fix test 2014-04-10 19:37:55 +07:00
Sergey M․ 6c30ff756a [mpora] Fix test 2014-04-10 19:10:03 +07:00
Jaime Marquínez Ferrándiz 62749e4708 [morningstar] Also support 'Cover' (#2729) 2014-04-09 20:51:28 +02:00
Jaime Marquínez Ferrándiz 6b7dee4b38 [morningstar] Recognize urls that use 'videoCenter' (fixes #2729) 2014-04-09 20:45:49 +02:00
Sergey M․ ef2041eb4e [br] Add audio extraction and support more URLs (Closes #2728) 2014-04-09 20:19:27 +07:00
Philipp Hagemeister 29e3e682af [comedycentral] Match more URLs
Looks like they only offer clips instead of full episodes now. We'll need to add new parsing code as well.
2014-04-09 11:43:15 +02:00
Sergey M․ c47d21da80 [ntv] Update test 2014-04-08 19:11:40 +07:00
Anisse Astier ec0fafbb19 [extractor/common] fallback on utf-8 when charset is not found
fixes #2721
2014-04-07 23:10:16 +02:00
Jaime Marquínez Ferrándiz 91a6addeeb Add support for rtve.es/alacarta 2014-04-07 17:30:32 +02:00
Philipp Hagemeister dfb2cb5cfd [teamcoco] Simplify ID management (Closes #2715) 2014-04-07 15:25:35 +02:00
Philipp Hagemeister 0ba77818f3 [ted] Add width and height (Fixes #2716) 2014-04-07 13:11:30 +02:00
Sergey M․ 09baa7da7e [rts] Update test 2014-04-07 00:34:23 +07:00
Sergey M․ 85e787f51d [cbsnews] Add support for cbsnews.com (Closes #2691) 2014-04-06 06:03:58 +07:00
Philipp Hagemeister 2a9e1e453a Merge branch 'master' of github.com:rg3/youtube-dl 2014-04-05 20:05:47 +02:00
Philipp Hagemeister ee1e199685 [justin.tv] Modernize (Fixes #2705) 2014-04-05 17:56:36 +02:00
Sergey M․ 17c5a00774 [novamov] Simplify 2014-04-05 19:36:22 +07:00
Sergey M․ 15c0e8e7b2 [generic] Generalize novamov based embeds 2014-04-05 17:20:05 +07:00
Sergey M․ cca37fba48 [divxstage] Fix typo in IE_NAME 2014-04-05 17:15:43 +07:00
Sergey M․ 9d0993ec4a [movshare] Support more domains 2014-04-05 17:00:18 +07:00
Sergey M․ 342f33bf9e [divxstage] Support more domains 2014-04-05 16:50:05 +07:00
Sergey M․ 7cd3bc5f99 [nowvideo] Support more domains 2014-04-05 16:38:57 +07:00
Sergey M․ 931055e6cb [videoweed] Revert _FILE_DELETED_REGEX 2014-04-05 16:32:14 +07:00
Sergey M․ d0e4cf82f1 [movshare] Add _FILE_DELETED_REGEX 2014-04-05 16:31:38 +07:00
Sergey M․ 6f88df2c57 [divxstage] Add support for divxstage.eu 2014-04-05 16:29:44 +07:00
Sergey M․ 4479bf2762 [videoweed] Simplify 2014-04-05 16:09:28 +07:00
Sergey M․ 1ff7c0f7d8 [movshare] Add support for movshare.net 2014-04-05 16:09:03 +07:00
Sergey M․ 50f566076f [generic] Add support for videoweed embeds 2014-04-05 15:49:45 +07:00
Sergey M․ 92810ff497 [nowvideo] Improve _VALID_URL 2014-04-05 15:35:21 +07:00
Sergey M․ 60ccc59a1c [novamov] Improve _VALID_URL 2014-04-05 15:34:54 +07:00
Sergey M․ 91745595d3 [videoweed] Simplify 2014-04-05 15:32:55 +07:00
Sainyam Kapoor d6e40507d0 [videoweed]Cleanup 2014-04-05 10:53:22 +05:30
Sainyam Kapoor deed48b472 [Videoweed] Added support for videoweed. 2014-04-05 10:40:03 +05:30
Philipp Hagemeister e4d41bfca5 Merge pull request #2696 from anovicecodemonkey/support-ustream-embeds
[UstreamIE] [generic] Added support for Ustream embed URLs (Fixes #2694)
2014-04-04 23:33:08 +02:00
Philipp Hagemeister f8514f6186 [rts] Use visible id in file names
Maybe the internal ID is more precise, but it's totally confusing, and the obvious ID still allows a google search.
2014-04-04 23:13:55 +02:00
Philipp Hagemeister e09b8fcd9d [ro220] Make test case more flexible
Either one or two spaces is fine here.
2014-04-04 23:08:33 +02:00
Philipp Hagemeister 7d1b527ff9 [motorsport] Fix on Python 3 2014-04-04 23:06:27 +02:00
Philipp Hagemeister c465afd736 [teamcoco] Fix regex in 2.6 (#2700)
The re engine does not want to repeat an empty string, for fear that something like

    (.*)*

could be matching the tokens ...

    ""
    "" ""
    "" "" ""

Of course, that's harmless with a question mark, although still somewhat strange.
2014-04-04 22:46:47 +02:00
Philipp Hagemeister b84d6e7fc4 Merge remote-tracking branch 'AGSPhoenix/teamcoco-fix' 2014-04-04 22:44:49 +02:00
Philipp Hagemeister c8edf47b3a [yahoo] Support https and -uploader URLs (Fixes #2701) 2014-04-04 22:23:59 +02:00
Philipp Hagemeister 3b4c26a428 [pornhd] Avoid shadowing variable url 2014-04-04 22:22:30 +02:00
Philipp Hagemeister 1525148114 Remove unused imports 2014-04-04 22:22:11 +02:00
AGSPhoenix fa387d2d99 Revert "Workaround for regex engine limitation"
This reverts commit 6d0d573eca.
2014-04-04 15:37:49 -04:00
AGSPhoenix 6d0d573eca Workaround for regex engine limitation 2014-04-04 15:25:28 -04:00
AGSPhoenix bb799e811b Add a test for the new URL pages
Add a test for the pages with the video_id in the URL.
2014-04-04 13:52:35 -04:00
AGSPhoenix 04ee53eca1 Support TeamCoco URLs with video_id in the title
If the URL has the video_id in it, use that since the current method of
finding the id breaks on those pages.

Fixes 2698.
2014-04-04 13:42:34 -04:00
Jaime Marquínez Ferrándiz 659eb98a53 [breakcom] Fix YouTube videos extraction (fixes #2699) 2014-04-04 19:01:18 +02:00
anovicecodemonkey ca6aada48e Fix _TEST for Ustream embed URLs 2014-04-05 03:26:29 +10:30
Jaime Marquínez Ferrándiz 43df5a7e71 [keezmovies] Modernize 2014-04-04 18:52:43 +02:00
Jaime Marquínez Ferrándiz 88f1c6de7b [yahoo] Modernize 2014-04-04 18:52:43 +02:00
Sergey M․ 65a40ab82b [pornhd] Update test checksum 2014-04-04 22:47:38 +07:00
Sergey M․ 4b9cced103 [pornhd] Fix extraction (Closes #2693) 2014-04-04 22:45:39 +07:00
anovicecodemonkey 5c38625259 [UstreamIE] [generic] Added support for Ustream embed URLs (Fixes #2694) 2014-04-05 00:53:09 +10:30
Sergey M․ 6344fa04bb [rts] Add more formats and audio support (Closes #2689) 2014-04-04 20:42:06 +07:00
Philipp Hagemeister 68eb8e90e6 [youtube:playlist] Fix playlists for logged-in users (Fixes #2690) 2014-04-04 02:23:36 +02:00
Philipp Hagemeister 0e518e2fea [cnet] Fall back to "videos" key 2014-04-04 02:09:04 +02:00
Philipp Hagemeister 1e0a235f39 [dailymotion] Fix playlist+user 2014-04-04 02:04:16 +02:00
Philipp Hagemeister 9ad400f75e [generic] Remove test case that has become a 404 2014-04-04 01:47:17 +02:00
Philipp Hagemeister 2ad4d1ba07 [morningstar] Add new extractor (Fixes #2687) 2014-04-04 00:25:35 +02:00
Philipp Hagemeister 6ff5f12218 [motorsport] Add extractor (Fixes #2688) 2014-04-04 00:05:43 +02:00
Jaime Marquínez Ferrándiz 983af2600f [wimp] Detect youtube videos (fixes #2686) 2014-04-03 20:44:51 +02:00
Philipp Hagemeister f34e6a2cd6 [comedycentral:shows] Do no include 6-digit identifier in display ID 2014-04-03 18:39:00 +02:00
Philipp Hagemeister 9271bc8355 [cnet] Add new extractor (Fixes #2679) 2014-04-03 16:21:21 +02:00
Jaime Marquínez Ferrándiz e45d40b171 [youtube:subscriptions] Add space to the description 2014-04-03 15:13:52 +02:00
Sergey M․ 4a419b8851 [c56] Modernize and add duration extraction 2014-04-03 19:53:11 +07:00
Philipp Hagemeister 177fed41bc [comedycentral:shows] Support guest/ URLs (Fixes #2677) 2014-04-03 14:38:16 +02:00
Philipp Hagemeister cce929eaac [franceculture] Add extractor (Fixes #2669) 2014-04-03 08:55:38 +02:00
Philipp Hagemeister b6cfde99b7 Only mention websense URL once 2014-04-03 08:12:53 +02:00
Philipp Hagemeister 2410c43d83 Detect Websense censorship (Fixes #2670) 2014-04-03 06:09:38 +02:00
Philipp Hagemeister aea6e7fc3c [cspan] Support multiple segments (Fixes #2674) 2014-04-03 06:09:38 +02:00
Sergey M․ 91a76c40c0 [musicplayon] Add support for musicplayon.com 2014-04-02 22:10:20 +07:00
Jaime Marquínez Ferrándiz f6177462db [youtube] feeds: Also look for the html in the 'content_html' field (fixes #2671) 2014-04-02 14:13:08 +02:00
Jaime Marquínez Ferrándiz 9ddaf4ef8c [comedycentral] Change XPath .//guid to ./guid (fixes #2668)
It fails to find the element in python 2.6 and it's not required, the
element is a direct child of the item node.
2014-04-01 21:38:07 +02:00
Jaime Marquínez Ferrándiz 97b5573848 [comedycentral] Update test title for 34cbc7ee8d 2014-04-01 21:29:40 +02:00
Jaime Marquínez Ferrándiz 18c95c1ab0 [rutube] Use _download_json 2014-04-01 20:30:22 +02:00
Sergey M․ 0479c625a4 [brightcove] Encode object_str with utf-8 2014-04-01 20:17:35 +07:00
Sergey M․ f659951e22 [vk] Support optional dash for oid in embedded links 2014-04-01 19:38:42 +07:00
Philipp Hagemeister 5912c639df [youtube] Transform google's JSON dialect (fixes #2663) 2014-04-01 05:56:56 +02:00
Philipp Hagemeister 651486621d [comedycentral] Allow URLs with query parts (fixes #2661) 2014-04-01 00:25:11 +02:00
Philipp Hagemeister 16f4eb723a [comedycentral] Add support for /videos URLs (Fixes #2660) 2014-04-01 00:02:32 +02:00
Sergey M․ 1cbd410620 [pyvideo] Modernize 2014-03-31 19:31:48 +07:00
Philipp Hagemeister 9c1fc022ae [generic] Warn before fallback to automatic search 2014-03-30 15:57:35 +02:00
Philipp Hagemeister 83d548ef0f [youtube] Encode ytsearch query 2014-03-30 15:57:35 +02:00
Sergey M․ c72477bd32 [rutube] Modernize 2014-03-30 15:35:07 +07:00
Philipp Hagemeister 9a7b072e38 [wdr] Add support for more wdrmaus subpages 2014-03-30 07:42:35 +02:00
Philipp Hagemeister cd7481a39e [wdr] Add support for wdrmaus.de (Fixes #2651) 2014-03-30 07:25:42 +02:00
Philipp Hagemeister acd213ed6d Remove unusued imports 2014-03-30 07:16:07 +02:00
Philipp Hagemeister 2b25cb5d76 [youtube] Move JavaScript interpreter into its own module 2014-03-30 07:02:58 +02:00
Jaime Marquínez Ferrándiz e79162558e [wat] Modernize 2014-03-29 15:15:16 +01:00
Jaime Marquínez Ferrándiz 2da67107ee [tf1] Modernize 2014-03-29 15:05:15 +01:00
Jaime Marquínez Ferrándiz 2ff7f8975e [nba] Modernize 2014-03-29 14:57:48 +01:00
Jaime Marquínez Ferrándiz 87a2566048 [metacritic] Modernize test 2014-03-29 14:57:48 +01:00
Jaime Marquínez Ferrándiz 986f56736b [roxwel] Modernize 2014-03-29 14:57:44 +01:00
Jaime Marquínez Ferrándiz 2583a0308b [huffpost] Modernize test 2014-03-29 14:35:45 +01:00
Jaime Marquínez Ferrándiz 40c716d2a2 [ign] Modernize 2014-03-29 14:34:03 +01:00
Jaime Marquínez Ferrándiz 79bfd01001 [kickstarter] Fix extraction, extract more info and modernize 2014-03-29 14:22:28 +01:00
Jaime Marquínez Ferrándiz f2bcdd8e02 [discovery] modernize 2014-03-29 14:22:27 +01:00
Jaime Marquínez Ferrándiz 7e70ac36b3 [bloomberg] Fix extraction (fixes #2154)
Stop using the OoyalaIE, extract the f4m url instead.
2014-03-29 11:55:12 +01:00
Sergey M․ 056b56688a [ntv] Simplify 2014-03-29 15:55:03 +07:00
Philipp Hagemeister b17418313f [oe1] Simplify (#2646) 2014-03-28 23:23:58 +01:00
Philipp Hagemeister e9a6fd6a68 Merge remote-tracking branch 'phaer/add-oe1-support' 2014-03-28 23:21:58 +01:00
Philipp Hagemeister 43f775e4ca [comedycentral] Duration can now be a float (Fixes #2647) 2014-03-28 23:06:34 +01:00
Sergey M․ 8f6562448c [ntv] Move app guess outside formats loop 2014-03-28 23:09:56 +07:00
Sergey M․ 263f4b514b [ntv] Add support for ntv.ru (Closes #2581) 2014-03-28 23:01:08 +07:00
phaer f0da3f1ef9 [oe1] Add support for oe1.orf.at. 2014-03-28 17:57:25 +02:00
Sergey M․ cb3ac1c610 [smotri] Modernize and add support for emdebbed videos (Closes #2585) 2014-03-28 19:58:49 +07:00
Sergey M․ 8efd15f477 [canalplus] Fix video id extraction (Closes #2645) 2014-03-28 18:47:15 +07:00
Jaime Marquínez Ferrándiz d26ebe990f [ehow] Modernize 2014-03-27 21:23:02 +01:00
Jaime Marquínez Ferrándiz 28acf5500a [appletrailers] Modernize 2014-03-27 21:10:51 +01:00
Jaime Marquínez Ferrándiz 214c22c704 [niconico] Modernize 2014-03-27 21:01:09 +01:00
Sergey M․ 8cdafb47b9 [mooshare] Add support for URLs starting with 'www' 2014-03-27 19:08:35 +07:00
Philipp Hagemeister 0dae5083f1 [urort] Add date 2014-03-27 02:56:23 +01:00
Philipp Hagemeister e2b06e76c1 [urort] Add extractor (Fixes #2634) 2014-03-27 02:51:50 +01:00
Philipp Hagemeister e9c076c317 [clipsyndicate] Modernize 2014-03-27 02:30:00 +01:00
Philipp Hagemeister ac6c104871 [ted] Add support for watch/ URLs (Fixes #2637) 2014-03-27 02:22:40 +01:00
Philipp Hagemeister e55213ce35 Merge remote-tracking branch 'malept/tds-extended-interviews' 2014-03-27 02:02:18 +01:00
Mark Lee 24a2aac445 [comedycentral] fix TDS extended interviews
The new website broke the URL format.
Added "playlist" as a valid ID keyword.
2014-03-26 10:51:02 -07:00
Jaime Marquínez Ferrándiz 98acdc895b Merge remote-tracking branch 'dstftw/download-referer-header' (closes #2628) 2014-03-26 15:20:11 +01:00
Jaime Marquínez Ferrándiz bd3b5b8b10 [slashdot] Remove extractor
The generic ooyala detection works fine.
2014-03-26 15:09:14 +01:00
Jaime Marquínez Ferrándiz 9a90636805 [vice] Remove extractor
The generic ooyala detection works fine.
2014-03-26 15:03:34 +01:00
Sergey M․ 6a66ae96ed [cspan] Roll back unfinished rtmp support 2014-03-26 19:51:54 +07:00
Philipp Hagemeister 34cbc7ee8d [comedycentral] Better titles 2014-03-25 23:46:51 +01:00
Sergey M․ a59e40a1ea Replace 'referer' with 'http_referer' 2014-03-25 21:53:26 +07:00
Sergey M․ ad0a75db6b [auengine] Add referer 2014-03-25 21:22:41 +07:00
Sergey M․ b4461b6ebe [auengine] Modernize 2014-03-25 21:16:10 +07:00
Philipp Hagemeister 865cbf4fc5 [comedycentral] Correct uri (Fixes #2627) 2014-03-25 14:27:23 +01:00
Philipp Hagemeister 99b380c33b [comedycentral] Fix thedailyshow / thecolbertreport (Fixes #2600, #2596) 2014-03-25 04:00:57 +01:00
Philipp Hagemeister b8a792de80 Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	youtube_dl/extractor/arte.py
2014-03-24 23:23:17 +01:00
Philipp Hagemeister fac55558ad [washingtonpost] Add extractor (Fixes #2622) 2014-03-24 23:21:20 +01:00
Jaime Marquínez Ferrándiz b2799ff96d [arte] Fix videos.arte.tv extraction 2014-03-24 22:38:51 +01:00
Philipp Hagemeister 7a249480b4 [arte] Fix video.arte.tv extractor 2014-03-24 22:34:03 +01:00
Philipp Hagemeister f605128d13 [rts] Add thumbnail support 2014-03-24 22:32:04 +01:00
Philipp Hagemeister ba40a74666 [clipfish] Modernize 2014-03-24 22:30:32 +01:00
Philipp Hagemeister 893f8832b5 [arte] Add support for embedded videos (Fixes #2620) 2014-03-24 22:01:47 +01:00
Philipp Hagemeister 878d11ec29 [arte] Add support for multiple formats 2014-03-24 21:36:26 +01:00
Philipp Hagemeister 515bbe4b5b [arte] Remove liveweb support
liveweb.arte.tv is no longer functional, everything has moved to concert
2014-03-24 21:31:19 +01:00
Philipp Hagemeister 6949d81095 [byutv] Add support (Fixes #2612) 2014-03-24 17:12:15 +01:00
Philipp Hagemeister f847ca02d3 [addanime] Modernize 2014-03-24 16:39:53 +01:00
Sergey M․ b540697a8a [veoh] Improve extraction, fix youtube extraction (Closes #2616) 2014-03-24 20:53:03 +07:00
Philipp Hagemeister 0d3641e589 [cinemassacre] Fix #2815 2014-03-24 13:43:13 +01:00
Philipp Hagemeister 5e114e4bfe [soundcloud] Always add streaming formats 2014-03-24 02:21:17 +01:00
Philipp Hagemeister 83622b6d2f [soundcloud] Simplify string literals 2014-03-24 02:15:31 +01:00
Philipp Hagemeister f70daac108 [RTS] Add extractor (Fixes #2608) 2014-03-24 01:41:14 +01:00
Philipp Hagemeister 912b38b428 [instagram] Fix info_dict key name 2014-03-24 01:40:09 +01:00
Philipp Hagemeister 51fb2e98d2 [radiofrance] Modernize 2014-03-23 17:43:33 +01:00
Philipp Hagemeister 38d63d846e [extractor/common] Clarify preference key in formats 2014-03-23 17:41:43 +01:00
Philipp Hagemeister ea38e55fff [instagram] Add support for user profiles (Fixes #2606) 2014-03-23 16:06:07 +01:00
Philipp Hagemeister 1986025d2b [xbef] (Add extractor) 2014-03-23 14:04:36 +01:00
Philipp Hagemeister c9aa111b4f [worldstarhiphop] Modernize 2014-03-23 13:49:15 +01:00
Philipp Hagemeister bfcb6e3917 Merge remote-tracking branch 'fiocfun/xtube-user-extractor' 2014-03-23 13:36:14 +01:00
Sergey M․ 2c1396073e [metacafe] Remove accidently inserted comment string 2014-03-23 05:16:02 +07:00
Sergey M․ 401983c6a0 [metacafe] More modernize 2014-03-23 05:13:15 +07:00
Sergey M․ 391dc3ee07 [metacafe] Replace cbs test 2014-03-23 05:08:11 +07:00
Sergey M․ be3b8fa30f [metacafe] Modernize 2014-03-23 05:05:31 +07:00
fiocfun 9f5809b3e8 [xtube] user playlist extractor 2014-03-23 00:16:35 +06:00
Sergey M․ 0320ddc192 [pornhub] Fix uploader extraction and extract counts 2014-03-22 21:30:22 +07:00
Philipp Hagemeister 56dd55721c Remove unused imports and clarify variable names 2014-03-22 15:17:32 +01:00
Philipp Hagemeister 231f76b530 [toypics] Separate user and video extraction (#2601) 2014-03-22 15:15:01 +01:00
Philipp Hagemeister 55442a7812 Merge remote-tracking branch 'fiocfun/toypics-support' 2014-03-22 14:24:44 +01:00
Philipp Hagemeister 43b81eb98a [youtube] Remove useless resolution fields from format definitions
These can be - and are - calculated automatically by the YoutubeDL core.
2014-03-22 14:22:41 +01:00
Philipp Hagemeister bfd718793c Merge remote-tracking branch 'hurda/patch-1' 2014-03-22 14:21:04 +01:00
Philipp Hagemeister a9c2896e22 Make missing test definition fields an error
If the result is not testable (for example, because a description changes often), either pass in a type or a regular expression (a string starting with 're:')
2014-03-22 14:20:07 +01:00
hurda 278229d195 itag 160 is 144p, not 192p 2014-03-22 12:15:45 +01:00
Philipp Hagemeister fa154d1dbe [videolectures.net] Make description optional 2014-03-22 12:10:56 +01:00
Jaime Marquínez Ferrándiz 7e2ede9891 [generic] Run TED detection before JW Player detection
Otherwise it overwrittes the `mobj` variable.
2014-03-22 10:20:44 +01:00
fiocfun 74af99fc2f toypics.net support 2014-03-22 04:07:44 +06:00
Jaime Marquínez Ferrándiz 0f2a2ba14b Merge remote-tracking branch 'dstftw/generic-webpage-unescape'
Conflicts:
	youtube_dl/extractor/generic.py
2014-03-21 22:14:24 +01:00
Jaime Marquínez Ferrándiz e24b5a8610 [ooyala] Modernize 2014-03-21 21:55:51 +01:00
Jaime Marquínez Ferrándiz 750f9020ae [generic] Recognize more Ooyala embedded videos (#2569) 2014-03-21 21:51:33 +01:00
Jaime Marquínez Ferrándiz f82863851e Add an extractor for on.aol.com 2014-03-21 19:54:44 +01:00
Jaime Marquínez Ferrándiz 933a5b3792 Add extractor for Engadget and 5min (closes #2465)
engadget.com uses the generic 5min.com service.
2014-03-21 19:13:46 +01:00
Sergey M․ aa488e1385 [xtube] Fix formats extraction 2014-03-21 23:58:40 +07:00
Philipp Hagemeister 64e7ad6045 [videolectures] (New extractor) 2014-03-21 14:38:41 +01:00
Philipp Hagemeister 23f4a93bb4 [daum] Modernize 2014-03-21 14:38:41 +01:00
Jaime Marquínez Ferrándiz 6f13b055f1 [cspan] Fix typo in a comment 2014-03-21 08:01:20 +01:00
Philipp Hagemeister 11a15be4ce [cspan] Add support for newer videos (Fixes #2577) 2014-03-21 02:10:24 +01:00
Philipp Hagemeister 1b124d1942 [parliamentliveuk] Add extractor 2014-03-21 01:42:28 +01:00
Philipp Hagemeister a1a530b067 [pbs] Add support for video ratings 2014-03-21 00:59:51 +01:00
Philipp Hagemeister cb9722cb3f [viki] Modernize 2014-03-21 00:53:18 +01:00
Philipp Hagemeister 773c0b4bb8 [pbs] Add support for widget URLs (Fixes #2594) 2014-03-21 00:46:32 +01:00
Philipp Hagemeister 7e8c0af004 Add --prefer-insecure option (Fixes #2364) 2014-03-21 00:37:10 +01:00
Philipp Hagemeister d2983ccb25 [ninegag] Modernize and remove unused import 2014-03-21 00:37:10 +01:00
Philipp Hagemeister f24e9833dc [youporn] Modernize 2014-03-21 00:37:10 +01:00
Sergey M․ bc2bdf5709 [kontrtube] Modernize 2014-03-20 23:05:57 +07:00
Philipp Hagemeister aab74fa106 [ted] Simplify embed code (#2587) 2014-03-20 16:33:23 +01:00
Philipp Hagemeister 2bd9efd4c2 Merge remote-tracking branch 'anovicecodemonkey/TEDIEimprovements' 2014-03-20 16:24:34 +01:00
Jaime Marquínez Ferrándiz 39a743fb9b [arte] Modernize tests and fix _VALID_REGEX 2014-03-20 09:14:43 +01:00
Jaime Marquínez Ferrándiz 4966a0b22d [arte] Add extractor for concert.arte.tv (closes #2588) 2014-03-20 09:11:47 +01:00
anovicecodemonkey fc26023120 [TEDIE] Add support for embeded TED video URLs 2014-03-20 01:04:21 +10:30
anovicecodemonkey 8d7c0cca13 [generic] Add support for embeded TED videos 2014-03-20 00:56:32 +10:30
Sergey M․ f66ede4328 [arte.tv:+7] Fix _VALID_URL 2014-03-19 21:23:55 +07:00
Sergey M․ 17286a96f2 [iprima] Fix permission check regex 2014-03-18 19:33:28 +07:00
ericpardee f102372b5f Update to comedycentral.py (cc.com)
Added cc.com as it's same as comedycentral.com and used, i.e. http://www.cc.com/video-clips/fmyq0m/broad-city-a-beautiful-railroad-style-apartment
2014-03-17 18:01:26 -07:00
Jaime Marquínez Ferrándiz ecbe1ad207 [generic] Fix access to removed function in python 3.4
The `Request.get_origin_req_host` method was deprecated in 3.3, use the
 `origin_req_host` property if it's not available, see http://docs.python.org/3.3/library/urllib.request.html#urllib.request.Request.get_origin_req_host.
2014-03-17 21:59:21 +01:00
Sergey M․ e125c21531 [vesti] Restore vesti extractor 2014-03-17 02:01:01 +07:00
Sergey M․ 93d020dd65 [generic] Add support for embedded rutv player 2014-03-17 02:00:31 +07:00
Sergey M․ a7515ec265 [rutv] Refactor vgtrk/rutv extractor 2014-03-17 01:59:40 +07:00
Jaime Marquínez Ferrándiz b6c1ceccc2 [ted] Add 'http://' to the thumbnail url if it's missing 2014-03-16 11:24:11 +01:00
Philipp Hagemeister 6563837ee1 [udemy] Make sure test case is not inherited 2014-03-16 07:09:10 +01:00
Philipp Hagemeister fd5e6f7ef2 [vevo] Mark all test timestamps as approximate 2014-03-16 07:05:48 +01:00
Sergey M․ 15fd51b37c [generic] More generic support for embedded vimeo player (#1602) 2014-03-16 00:47:04 +07:00
Sergey M․ d95e35d659 [generic] Add nowvideo test hidden behind percent encoding 2014-03-15 04:39:53 +07:00
Sergey M․ 1439073049 [generic] Add comment for unescaping webpage contents 2014-03-15 04:38:49 +07:00
Sergey M 1f7659dbe9 [generic] Unescape webpage contents 2014-03-15 04:21:17 +07:00
Sergey M․ f1cef7a9ff [iprima] Skip test 2014-03-15 01:39:42 +07:00
Sergey M․ 8264223511 [iprima] Add access permission check 2014-03-15 01:38:44 +07:00
Jaime Marquínez Ferrándiz bc6d597828 Add bestvideo and worstvideo to special format names (#2163) 2014-03-14 17:01:47 +01:00
Philipp Hagemeister aba77bbfc2 [vevo] Adapt test to constantly changing timestamp 2014-03-13 18:45:14 +01:00
Philipp Hagemeister 955c451456 Rename upload_timestamp to timestamp 2014-03-13 18:45:14 +01:00
Sergey M․ e5de3f6c89 [udemy] Initial support for free courses (#1617) 2014-03-14 00:36:39 +07:00
Philipp Hagemeister 1e0eb60f1a [videobam] Fix empty title handling 2014-03-13 17:03:43 +01:00
Philipp Hagemeister 87a29e6f25 [wdr] Add description to tests 2014-03-13 17:01:58 +01:00
Philipp Hagemeister c3d36f134f [googlesearch] Fix next page indicator check 2014-03-13 16:52:13 +01:00
Philipp Hagemeister 84769e708c [ninegag] Fix extraction 2014-03-13 16:40:53 +01:00
Philipp Hagemeister 9d2ecdbc71 [vevo] Centralize timestamp handling 2014-03-13 15:30:25 +01:00
Philipp Hagemeister 9b69af5342 Merge remote-tracking branch 'soult/br' 2014-03-13 14:35:34 +01:00
David Triendl c21215b421 [br] Allow '/' in URL, allow empty author + broadcastDate fields
* Allow URLs that have a 'subdirectory' before the actual program name, e.g.
  'xyz/xyz-episode-1'.
* The author and broadcastDate fields in the XML file may be empty.
* Add test case for the two problems above.
2014-03-13 14:08:34 +01:00
Philipp Hagemeister cddcfd90b4 [funnyordie] Correct JSON interpretation 2014-03-13 00:53:19 +01:00
Sergey M․ f36aacba0f [collegehumor] Fix one more test 2014-03-13 06:25:12 +07:00
Sergey M․ 355271fb61 [collegehumor] Extract like count 2014-03-13 06:12:39 +07:00
Sergey M․ 2a5b502364 [collegehumor] Fix test 2014-03-13 06:09:21 +07:00
Jaime Marquínez Ferrándiz b1ff87224c [vimeo] Now VimeoIE doesn't match urls of channels with a numeric id (fixes #2552) 2014-03-12 14:23:06 +01:00
Sergey M․ b461641fb9 [wdr] Add support for WDR sites (Closes #1367) 2014-03-12 04:20:47 +07:00
Philipp Hagemeister 60cc4dc4b4 [generic/funnyordie] Add support for funnyordie embeds (Fixes #2546) 2014-03-11 16:51:36 +01:00
Philipp Hagemeister db95dc13a1 [playvid] Simplify (#2539) 2014-03-10 20:55:47 +01:00
Philipp Hagemeister 777ac90791 Merge remote-tracking branch 'MikeCol/playvid_extract' 2014-03-10 20:45:45 +01:00
MikeCol 4ea3137e41 Playvid extractor 2014-03-10 20:16:49 +01:00
Sergey M․ 3ee52157fb [vgtrk] Rename vesti extractor 2014-03-11 00:58:05 +07:00
Sergey M․ c4d197ee2d [vesti] Fix _VALID_URL regex 2014-03-11 00:49:41 +07:00
Philipp Hagemeister a33932cfe3 [vevo] Correct test value
The date is now interpreted as UTC for consistency.
2014-03-10 17:56:54 +01:00
Philipp Hagemeister bcf89ce62c [generic] Suppress warning about doctypes in RSS parser 2014-03-10 17:31:32 +01:00
Philipp Hagemeister e3899d0e00 Merge branch 'master' of github.com:rg3/youtube-dl 2014-03-10 16:42:22 +01:00
Philipp Hagemeister dcb00da49c [depositfiles] Remove extractor
This site requires a CAPTCHA to download, supports arbitrary files and not only audio/video, and I can't find a single uncopyrighted video with a quick google search.
Closes #1255
2014-03-10 16:41:08 +01:00
Sergey M․ aa51d20d19 [vesti] Skip geo restricted test 2014-03-10 22:31:22 +07:00
Philipp Hagemeister ae7ed92057 [youtube] Fix up invalid JSON 2014-03-10 13:35:45 +01:00
Philipp Hagemeister e45b31d9bd [vevo] Interpret date as UTC instead of local time 2014-03-10 13:12:57 +01:00
Philipp Hagemeister 5a25f39653 Correct extractor documentation 2014-03-10 13:09:55 +01:00
Jaime Marquínez Ferrándiz 4126826b10 [photobucket] More unicode literals 2014-03-10 12:59:19 +01:00
Sergey M․ b773ead7fd [vesti] Add support for more sites (Closes #2534) 2014-03-10 18:52:00 +07:00
Philipp Hagemeister fbc2dcb40b [aftonbladet] Modernize 2014-03-10 10:28:56 +01:00
Philipp Hagemeister 5375d7ad84 Merge remote-tracking branch 'mharrys/aftonbladet' 2014-03-10 10:23:45 +01:00
Jaime Marquínez Ferrándiz 90f3476180 [photobucket] Modernize and remove the old extraction code 2014-03-09 19:36:46 +01:00
Jaime Marquínez Ferrándiz ee95c09333 [pornhub] Use compat_urllib_parse.unquote_plus (#2531) 2014-03-09 19:16:25 +01:00
Jaime Marquínez Ferrándiz 75d06db9fc Merge branch 'pornhub_unquote_password' of github.com:MikeCol/youtube-dl 2014-03-09 19:15:33 +01:00
Jaime Marquínez Ferrándiz 439a1fffcb [myvideo] Modernize 2014-03-09 18:58:34 +01:00
Jaime Marquínez Ferrándiz 9d9d70c462 [facebook] Modernize 2014-03-09 18:42:44 +01:00
Jaime Marquínez Ferrándiz b4a186b7be [jukebox] Modernize and add a test 2014-03-09 18:33:17 +01:00
Jaime Marquínez Ferrándiz bdebf51c8f [xnxx] Modernize 2014-03-09 18:31:39 +01:00
MikeCol 264b86f9b4 Unquote password 2014-03-09 18:26:18 +01:00
Philipp Hagemeister 9e55e37a2e Merge remote-tracking branch 'origin/master' 2014-03-09 18:08:16 +01:00
Mattias Harrysson 27865b2169 [aftonbladet] add extractor for aftonbladet.se 2014-03-09 16:59:18 +01:00
Sergey M․ edb7fc5435 [videodetective] Modernize 2014-03-09 18:39:39 +07:00
Jaime Marquínez Ferrándiz 31f77343f2 [vube] Update the test's checksum 2014-03-09 12:27:38 +01:00
Jaime Marquínez Ferrándiz 63ad031583 [soundcloud] Add the description field to the second test 2014-03-09 12:26:58 +01:00
Jaime Marquínez Ferrándiz 806d6c2e8c [gamekings] Modernize and update the test's description field 2014-03-09 11:57:30 +01:00
Jaime Marquínez Ferrándiz 0ef68e04d9 [mtv] Transform the urls from the mobile version to get the best quality
And don't report a warning, just log a message, it allows to pass the test from Europe.
2014-03-08 22:09:42 +01:00
Sergey M․ a496524db2 [collegehumor] Replace youtube test 2014-03-09 03:21:26 +07:00
Jaime Marquínez Ferrándiz 935c7360cc [spike] Add support for mobile urls 2014-03-08 21:10:21 +01:00
Jaime Marquínez Ferrándiz 340b046876 [spike] Add support for downloading the mobile version if the normal version is geoblocked 2014-03-08 20:59:11 +01:00
Jaime Marquínez Ferrándiz cc1db7f9b7 [mtv] Improve detection of geoblocked videos 2014-03-08 19:46:34 +01:00
Philipp Hagemeister a4ff6c4762 [arte] Raise a proper error when no video is found 2014-03-08 16:04:03 +01:00
Philipp Hagemeister 1060425cbb [vimeo] Add a better error message for embed-only videos (#2527) 2014-03-08 12:25:09 +01:00
Sergey M․ 136db7881b [lynda] Modernize 2014-03-07 22:11:01 +07:00
Jaime Marquínez Ferrándiz b74fa8cd2c [facebook] Fix login process
It was broken and didn't work in python 3.
And use `_download_webpage` instead of `compat_urllib_request.urlopen`.
2014-03-07 15:25:33 +01:00
Sergey M․ 16ff7ebc77 [lynda] Fix successful login regex and fix formats extraction (Closes #2520) 2014-03-07 06:56:48 +07:00
Sergey M․ d37c07c575 [vesti] Fix extraction and support more link formats (Closes #2517) 2014-03-07 02:27:39 +07:00
Jaime Marquínez Ferrándiz 7b9965ea93 [ted] Remove unused import and modernize test 2014-03-05 14:27:45 +01:00
Philipp Hagemeister 0a5bce566f [generic] Add all test attributes for embedly (#2447)
In the future, we may want to not only print something, but throw an error for untested properties.
2014-03-05 14:05:50 +01:00
Philipp Hagemeister 8012bd2424 [generic] Get a better ID 2014-03-05 14:02:14 +01:00
Philipp Hagemeister f55a1f0a88 Merge remote-tracking branch 'rzhxeo/embedly'
Conflicts:
	youtube_dl/extractor/generic.py
2014-03-05 14:01:53 +01:00
Jaime Marquínez Ferrándiz bacac173a9 [ted] Style fixes 2014-03-05 13:27:26 +01:00
Jaime Marquínez Ferrándiz ca1fee34f2 [ted] Fix playlist extraction and add a test 2014-03-05 13:22:10 +01:00
Sergey M․ 6dadaa9930 [prosiebensat1] Replace test 2014-03-05 15:10:49 +07:00
Jaime Marquínez Ferrándiz 553f6e4633 [dailymotion] Convert width and height fields from strings to integers 2014-03-04 22:24:38 +01:00
Jaime Marquínez Ferrándiz 652bee05f0 [ted] Fix video extraction
The site has been redesigned
2014-03-04 21:47:01 +01:00
Sergey M․ e477dcf649 [vesti] Fix width and height 2014-03-04 21:40:35 +07:00
Sergey M․ 9d3f7781f3 [soundcloud:set] Fix _VALID_URL regex (Closes #2509) 2014-03-04 21:29:14 +07:00
Sergey M․ c7095dada3 [tvigle] Add support for another video link format 2014-03-04 19:22:48 +07:00
Sergey M․ 607dbbad76 [xtube] Fix extraction add more metafields 2014-03-04 16:12:11 +07:00
Philipp Hagemeister ab24f4f3be [facebook] Use consistent quotes 2014-03-04 03:49:12 +01:00
Philipp Hagemeister d0ff838433 [facebook] Correct regexp 2014-03-04 03:39:45 +01:00
Philipp Hagemeister b37b94501c [facebook] Fix login detection (#2505) 2014-03-04 03:39:04 +01:00
Philipp Hagemeister cb3bb2cfef [facebook] Modernize 2014-03-04 03:36:54 +01:00
Philipp Hagemeister c9ae7b9565 [youtube] Add support for search result URLs (Fixes #2495) 2014-03-04 03:32:28 +01:00
Philipp Hagemeister 9f62eaf4ef [canal13cl] Add test and improve extraction (#2498) 2014-03-03 12:53:11 +01:00
Philipp Hagemeister f92259c026 Merge remote-tracking branch 'origin/master' 2014-03-03 12:34:34 +01:00
Philipp Hagemeister 0afef30b23 Add display_id field 2014-03-03 12:06:28 +01:00
Philipp Hagemeister dcdfd1c711 Merge remote-tracking branch 'origin/master' 2014-03-03 12:05:59 +01:00
Sergey M․ 2acc1f8f50 [orf] Fix segments extraction (Closes #2501) 2014-03-03 18:05:46 +07:00
Sergey M․ 2c39b0c695 [tinypic] Fix import 2014-03-03 17:40:12 +07:00
Sergey M․ e77c5b4f63 [4tube] Fix import 2014-03-03 17:39:49 +07:00
Juan C. Olivares 409a16cb72 Allowing URLs for 13.cl without the /programas prefix 2014-03-02 23:41:13 -03:00
Juan C. Olivares 94d5e90b4f FIX: Typo in the extractor's name 2014-03-02 23:40:35 -03:00
Juan C. Olivares 2d73b45805 Adding support for 13.cl 2014-03-02 23:15:12 -03:00
Sergey M․ 271a2dbfa2 [tvigle] Add age limit 2014-03-02 22:07:18 +07:00
Sergey M․ bf4adcac66 [tvigle] Fix like count 2014-03-02 20:56:36 +07:00
Sergey M․ fb8b8fdd62 [tvigle] Add support for tvigle.ru 2014-03-02 19:59:34 +07:00
Sergey M․ 5a0b26252e [ceskatelevize] Simplify 2014-03-01 23:05:33 +07:00
Sergey M․ 7d78f0cc48 [ceskatelevize] Fix video availability check and add geo unrestricted test 2014-03-01 22:54:37 +07:00
Sergey M․ f00fc78674 Merge branch '_ceskatelevize' of https://github.com/pulpe/youtube-dl into pulpe-_ceskatelevize 2014-03-01 22:26:18 +07:00
pulpe 392017874c [CeskaTelevize] raise ExtractorError if you are outside of CR 2014-03-01 16:17:29 +01:00
pulpe c3cb92d1ab [CeskaTelevize] fix python3 support @dstftw 2014-03-01 16:02:51 +01:00
pulpe aa5590fa07 skip test 2014-03-01 12:34:01 +01:00
pulpe 8cfb5bbf92 [CeskaTelevize] Add initial support for ceskatelevize.cz 2014-03-01 11:47:52 +01:00
Sergey M. 69bb54ebf9 [mailru] Add support for mail.ru video 2014-03-01 16:34:38 +07:00
Sergey M. ca97a56e4b [vk] Add support for embedded videos (Closes #2473) 2014-02-28 23:51:54 +07:00
Sergey M. fc26f3b4c2 [lifenews] Add support for multiple videos on the same page (#2482) 2014-02-28 22:52:06 +07:00
Philipp Hagemeister f604c93c64 [gdcvault] Formatting / Remove unused variables 2014-02-28 15:50:19 +01:00
Philipp Hagemeister aba3231de1 Merge remote-tracking branch 'mnem/gdc-vault' 2014-02-28 12:52:11 +01:00
Sergey M. c0e5d85631 [vimeo] Improve thumbnail extraction 2014-02-28 18:00:12 +07:00
Sergey M. ca7fa3dcb3 [vimeo] Fix thumbs extraction (Closes #2480) 2014-02-28 17:43:54 +07:00
Jaime Marquínez Ferrándiz 4ccfba28d9 [collegehumor] Fix test's uploader field 2014-02-27 19:10:30 +01:00
Jaime Marquínez Ferrándiz abb82f1ddc [mixcloud] Unquote the track id (#2462) 2014-02-27 18:58:09 +01:00
Sergey M. 1877a14049 [lifenews] Switch to non-mobile webpage version (Fixes #2476) 2014-02-27 21:45:34 +07:00
David Wagner 546582ec3e Removing MD5 check for ethereal file. 2014-02-27 14:28:55 +00:00
David Wagner 4534485586 Fix test, remove unused, tidy quotes and brackets 2014-02-27 12:50:48 +00:00
Sergey M. a9ab8855e4 [prosiebensat1] Fix typo 2014-02-27 17:53:09 +07:00
Sergey M. 8a44ef6868 [prosiebensat1] Add rtmpe support 2014-02-27 17:52:52 +07:00
Sergey M. 0c7214c404 [prosiebensat1] Add support for ProSiebenSat.1 Digital sites (Closes
#2346 #2469)
2014-02-27 17:44:29 +07:00
David Wagner 50a138d95c Add support for authenticated videos 2014-02-27 10:32:31 +00:00
rzhxeo 1b86cc41cf Add support for embed.ly 2014-02-27 08:14:28 +01:00
Philipp Hagemeister f3783d4b77 Merge branch 'master' of github.com:rg3/youtube-dl 2014-02-27 07:22:22 +01:00
Philipp Hagemeister 89ef304bed [generic] Add support for <meta redirect>
Fixes #413
2014-02-27 07:22:02 +01:00
David Wagner 83cebb8b7a Add support for FLV videos with speaker decks 2014-02-27 00:20:34 +00:00
David Wagner 9e68f9fdf1 Extractor for non-password protected GDC Vault videos 2014-02-26 22:33:33 +00:00
Sergey M. 2acea5c03d [mit] Fix MITIE test 2014-02-26 18:09:43 +07:00
Sergey M. 978177527e [rtlnow] Remove unused import 2014-02-26 18:02:17 +07:00
Sergey M. 2648c436f3 Merge pull request #2464 from rzhxeo/xhamster
[XHamsterIE] Make hd video search more robust
2014-02-26 02:53:54 -08:00
Sergey M. 33f1f2c455 [rtlnow] Fix duration extraction 2014-02-26 17:49:49 +07:00
Sergey M. 995befe0e9 [rtlnow] Replace n-tvnow.de test 2014-02-26 17:43:56 +07:00
Sergey M. 1bb92aff55 [rtlnow] Modernize and add f4m support 2014-02-26 17:36:16 +07:00
rzhxeo b8e1471d3a [XHamsterIE] Make hd video search more robust 2014-02-26 10:01:44 +01:00
Philipp Hagemeister a83a3139d1 [mit] Add import 2014-02-26 00:41:13 +01:00
Philipp Hagemeister 0d7caf5cdf Merge remote-tracking branch 'ruuk/master' 2014-02-26 00:31:08 +01:00
Philipp Hagemeister 7216de55d6 [mit] Fix ocw tests 2014-02-26 00:29:45 +01:00
Philipp Hagemeister 7d75d06b78 Merge branch 'ocw-mit-edu' of https://github.com/amlweems/youtube-dl 2014-02-26 00:09:42 +01:00
Philipp Hagemeister 13ef5648c4 Merge branch 'master' of github.com:rg3/youtube-dl 2014-02-26 00:07:45 +01:00
Philipp Hagemeister 5b2478e2ba [mit] Modernize 2014-02-26 00:06:31 +01:00
Jaime Marquínez Ferrándiz 8b286571c3 [mixcloud] Fix _VALID_RE (fixes #2462)
Accept any character except `/` for uploader and the name, caused problems with non ASCII characters
2014-02-26 00:04:03 +01:00
Jaime Marquínez Ferrándiz 020cf5ebfd [nbc] Add an extractor for the main nbc.com site
Some of the videos are encrypted, the f4m downloader doesn’t support them.
2014-02-25 23:57:54 +01:00
ruuk 54ab193970 Extract thumbnail with _og_search_thumbnail 2014-02-25 14:41:36 -08:00
Anthony Weems 151bae3566 Add support for ocw.mit.edu video lectures 2014-02-25 14:44:34 -06:00
ruuk 76df418cba Add thumbnail for metacafe 2014-02-25 12:04:44 -08:00
Jaime Marquínez Ferrándiz d0a72674c6 [crunchyroll] Use enumerate 2014-02-25 20:51:51 +01:00
Sergey M. 1d430674c7 [crunchyroll] Handle error message 2014-02-25 20:30:17 +07:00
Sergey M 70cb73922b [crunchyroll] Fix subtitle lang code extraction 2014-02-25 20:29:53 +07:00
Sergey M 344400951c [crunchyroll] Tidy and modernize 2014-02-25 20:29:53 +07:00
Philipp Hagemeister 6cadf8c858 [vevo] Add age_limit support 2014-02-25 11:15:34 +01:00
Philipp Hagemeister 27579b9e4c [vevo] Add suppot for v3 SMIL URLs (Fixes #2409) 2014-02-25 11:06:47 +01:00
Philipp Hagemeister 4d756a9cc0 [testurl] Fix case when only one IE matches 2014-02-25 10:43:34 +01:00
AGSPhoenix 60d3a2e0f8 Fix incorrect format codes
Corrects the descriptions for the DASH video format codes 264 and 138
(1440p and 2160p, respectively).
2014-02-24 21:29:37 -05:00
Philipp Hagemeister eda1d49a62 Merge remote-tracking branch 'origin/master' 2014-02-25 01:45:00 +01:00
Jaime Marquínez Ferrándiz 2bfe4ead4b [veoh] Allow to download videos with age protection (fixes #2455) 2014-02-24 22:01:34 +01:00
Sergey M. b1c6c32f78 [generic] Add support for nowvideo embedded videos 2014-02-24 23:37:42 +07:00
Philipp Hagemeister f6acbdecf4 [podomatic] Use unicode_literals 2014-02-24 17:31:09 +01:00
Sergey M. f1c9dfcc01 [nowvideo] Rewrite based on novamov extractor 2014-02-24 23:30:58 +07:00
Sergey M. ce78943ae1 [novamov] Generalize extractor 2014-02-24 23:30:09 +07:00
Sergey M. d6f0d86649 [novamov] Improve _VALID_URL 2014-02-24 22:01:19 +07:00
Jaime Marquínez Ferrándiz 5bb67dbfea [cinemassacre] Modernize 2014-02-24 14:44:29 +01:00
Jaime Marquínez Ferrándiz 47610c4d3e [cinemassacre] Fix extraction
Now we download over http, we don't need rtmpdump.
2014-02-24 14:35:26 +01:00
Jaime Marquínez Ferrándiz b732f3581f [academicearth] Remove debug print 2014-02-24 14:20:17 +01:00
Jaime Marquínez Ferrándiz 9e57ce716f [academicearth] Fix extraction
The courses seems to be no longer available, changed the test to a playlist.
2014-02-24 14:18:12 +01:00
Jaime Marquínez Ferrándiz cd7ee7aa44 [nbc] Modernize 2014-02-24 14:00:31 +01:00
Jaime Marquínez Ferrándiz 3cfe791473 [iprima] Add missing ) 2014-02-24 13:50:53 +01:00
Philipp Hagemeister 973f2532f5 [iprima] Add support for -WEB URLs (Closes #2449) 2014-02-24 10:12:36 +01:00
Philipp Hagemeister bc3be21d59 [iprima] Clean up a little bit 2014-02-24 09:53:48 +01:00
Sergey M. 919052d094 [zdf] Fix podcast extraction and use unicode literals (Closes #2446) 2014-02-24 13:47:47 +07:00
Sergey M. a2dafe2887 [youtube] Fix mix video regex
Attributes' order in <li> is arbitrary and changes every time playlist
page is fetched, so we can't rely on `data-index` to be before
`data-video-username`.
2014-02-24 12:52:02 +07:00
Jaime Marquínez Ferrándiz 92661c994b [normalboots] Modernize and simplify 2014-02-23 18:28:22 +01:00
Jaime Marquínez Ferrándiz ffe8fe356a [normalboots] Fix video url extraction 2014-02-23 18:06:51 +01:00
Jaime Marquínez Ferrándiz bc2f773b4f [youtube:playlist] Fix mixes extraction (fixes #2444) 2014-02-23 17:17:36 +01:00
Sergey M. f919201ecc [vine] Extract more metadata and support low format 2014-02-23 19:02:31 +07:00
Jaime Marquínez Ferrándiz 9b77f951c7 [breakcom] Fix error when calling _search_regex
I passed `’webpage’` instead of the variable `webpage`.
2014-02-23 12:28:44 +01:00
Jaime Marquínez Ferrándiz a25f2f990a [breakcom] Fix info json extraction 2014-02-23 12:20:58 +01:00
Jaime Marquínez Ferrándiz 78b373975d [vine] Fix uploader extraction 2014-02-23 12:08:30 +01:00
Philipp Hagemeister 23c2baadb3 [videobam] Set age_limit to 18
From [their ToS](http://videobam.com/terms): "User must be eighteen 18[sic] years of age or older to use or access this web site."
2014-02-22 23:15:41 +01:00
Philipp Hagemeister 521ee82334 Fix imports 2014-02-22 23:03:12 +01:00
Sergey M. 3e123c1e28 [videobam] Add support for videobam.com (Closes #2411) 2014-02-23 04:50:05 +07:00
Philipp Hagemeister 06aabfc422 [br] Simplify 2014-02-22 20:17:26 +01:00
Philipp Hagemeister 1052d2bfec Merge remote-tracking branch 'soult/br' 2014-02-22 17:14:47 +01:00
Philipp Hagemeister 491ed3dda2 [trutube] Support multiple formats (#2433) 2014-02-22 15:05:30 +01:00
Philipp Hagemeister af284c6d1b Merge remote-tracking branch 'JohnyMoSwag/master' 2014-02-22 14:38:42 +01:00
Philipp Hagemeister 41d3ec5fba [savefrom] Add extractor (Fixes #2434) 2014-02-22 14:36:16 +01:00
Philipp Hagemeister 0568c352f3 [canalc2] Modernize 2014-02-22 14:27:09 +01:00
Sergey M. 2e7b4cb714 [spankwire] Fix uploader id regex 2014-02-22 16:50:08 +07:00
Sergey M. 9767726b66 [spankwire] Improve and modernize 2014-02-22 16:45:03 +07:00
Johny Mo Swag 9ddfd84e41 added trutubeIE 2014-02-22 00:11:57 -08:00
David Triendl 7928024f57 [BR] Add basic test 2014-02-21 18:00:05 +01:00
David Triendl 3eb38acb43 [BR] Add "BR" extractor
Extractor for videos from the Bayerischer Rundfunk Mediathek[1]. Currently only
supports videos. Audio and podcasts do not work yet with this extractor.

1: http://br.de/mediathek
2014-02-21 17:58:52 +01:00
Jaime Marquínez Ferrándiz f7300c5c90 [generic] Fix on python 2.6
`ParseError` is not available, it raises `xml.parsers.expat.ExpatError`.
The webpage needs to be encoded.
2014-02-21 16:59:10 +01:00
Jaime Marquínez Ferrándiz 3489b7d26c [youtube] Simplify the decryption process for the manifest urls and add a test (closes #2422) 2014-02-21 15:15:58 +01:00
Jaime Marquínez Ferrándiz acd2bcc384 Merge branch 'youtube-dash' of github.com:m0vie/youtube-dl 2014-02-21 15:02:47 +01:00
Sergey M. da36297988 [wimp] Modernize and replace test 2014-02-21 17:57:19 +07:00
Sergey M. dbb94fb044 [youtube] Fix playlist extraction (Closes #2423, #2424, #2425) 2014-02-21 17:19:55 +07:00
m0viefreak d68f0cdb23 [youtube] decrypt signature when downloading dash manifest 2014-02-21 03:24:56 +01:00
Philipp Hagemeister 4fc946b546 [generic] Add support for RSS feeds (Fixes #667) 2014-02-20 13:14:09 +01:00
Sergey M. 280bc5dad6 [bbccouk] Add friendly contry filter error message (#2184) 2014-02-20 18:50:34 +07:00
Sergey M. ccb079ee67 [xhamster] Fix and improve 2014-02-20 02:37:44 +07:00
Philipp Hagemeister 572a89cc4e [liveleak] Add support for prochan embeds (Fixes #2406) 2014-02-19 01:27:12 +01:00
Philipp Hagemeister a9c7198a0b [testurl] Add extractor
This is a pseudo extractor that can be used to quickly look up test URLs, or test without the test harness.
2014-02-19 01:06:16 +01:00
Philipp Hagemeister f6f01ea17b [space] modernize 2014-02-19 01:04:24 +01:00
Sergey M. f2d0fc6823 [bbccouk] Replace test
This older episode is from 1994 and hopefully won't get deleted.
2014-02-19 06:46:14 +07:00
Sergey M. f7000f3a1b [youtube] Add support for yourepeat.com URLs (Closes #2397) 2014-02-19 02:00:54 +07:00
Sergey M. c7f0177fa7 [bbccouk] Skip test 2014-02-18 00:26:12 +07:00
Philipp Hagemeister 2eb5d315d4 [youtube] Match more truncated URLs (Closes #2402) 2014-02-17 14:56:21 +01:00
Philipp Hagemeister ad5976b4d9 [vimeo] Modernize test definition 2014-02-17 11:44:24 +01:00
Philipp Hagemeister 960f317171 [helsinki] Simplify 2014-02-17 11:32:30 +01:00
Philipp Hagemeister 4412ca751d Merge remote-tracking branch 'Nikerabbit/hki' 2014-02-17 11:26:09 +01:00
Sergey M. ae6cae78f1 [4tube] Minor changes and extract more metadata 2014-02-17 03:51:03 +07:00
Sergey M 3f32c0ba4c Merge branch '4tube' of https://github.com/patheticpat/youtube-dl into patheticpat-4tube 2014-02-17 02:21:45 +07:00
Sergey M. 541cb26c0d [smotri] Add entry for netrc authentication 2014-02-17 02:19:55 +07:00
Sergey M. 5544e038ab [vk] Add entry for netrc authentication 2014-02-17 02:17:10 +07:00
Sergey M. 9032dc28a6 [vk] Add login feature (Closes #2206) 2014-02-17 02:05:15 +07:00
Michael Kaiser 03635e2a71 Add support for 4tube.com. 2014-02-16 18:10:39 +01:00
Sergey M. 00cf938aa5 [nfb] Add rtmp app field to format 2014-02-16 06:11:38 +07:00
Philipp Hagemeister a5f707c495 Merge branch 'master' of github.com:rg3/youtube-dl 2014-02-15 20:45:12 +01:00
Jaime Marquínez Ferrándiz 1824b48169 [f4m] Download only the first fragment with the --test option 2014-02-15 17:53:23 +01:00
Philipp Hagemeister 07ad22b8af [youtube:search] Mark "no results found" error as expected 2014-02-15 16:30:11 +01:00
Philipp Hagemeister 6a7a389679 Merge branch 'master' of github.com:rg3/youtube-dl 2014-02-15 15:34:17 +01:00
Philipp Hagemeister 4edff78531 Merge remote-tracking branch 'jaimeMF/f4m'
Conflicts:
	youtube_dl/extractor/__init__.py
2014-02-15 15:32:13 +01:00
Jaime Marquínez Ferrándiz e68abba910 [sohu] Skip test
Only available from China
2014-02-15 13:12:41 +01:00
Jaime Marquínez Ferrándiz 3165dc4d9f [france2.fr:generation-quoi] Skip test
The videos seem to not be available outside France
2014-02-15 13:04:31 +01:00
Niklas Laxström 66c43a53e4 Add support for video.helsinki.fi archives 2014-02-14 18:14:28 +02:00
Sergey M. 463b334616 [ndr] Replace 404 test 2014-02-14 23:12:15 +07:00
Sergey M. b71dbc57c4 [vesti] Fix player regex (Closes #2382) 2014-02-14 22:26:13 +07:00
Philipp Hagemeister 72ca1d7f45 [vesti] Skip test 2 due to geo restrictions
At least that's how I interpret the error message "Просмотр вид��о ограничен в вашем регионе."
2014-02-13 22:19:59 +01:00
Sergey M. 1074982e6e [vesti] Add support for vesti.ru videos and live streams (Closes #2376) 2014-02-13 23:23:48 +07:00
Philipp Hagemeister 29b2aaf035 [jadorecettepub] Remove unused import 2014-02-13 16:33:12 +01:00
Philipp Hagemeister 6f90d098c5 [ecapist] modernize and fix id property 2014-02-13 16:32:42 +01:00
pulpe 896583517f [collegehumor, chilloutzone] changed description in tests 2014-02-12 15:11:57 +01:00
Sergey M. 713d31fac8 [gametrailers] Fix gametrailers test 2014-02-12 01:50:53 +07:00
Sergey M. 96cb10a5f5 [mtv] Improve title extraction 2014-02-12 01:07:30 +07:00
Sergey M. c207c1044e Merge pull request #2372 from pulpe/dropbox_fix
[dropbox] replace not working test
2014-02-11 09:34:49 -08:00
pulpe 79629ec717 [dropbox] replace not working test 2014-02-11 17:27:36 +01:00
Sergey M. 008fda0f08 [ndr] Replace 404 video test 2014-02-11 21:21:05 +07:00
Jaime Marquínez Ferrándiz 0ae6b01937 [cnn] Add an extractor for blogs (closes #2361) 2014-02-11 14:38:17 +01:00
Jaime Marquínez Ferrándiz def630e523 [xtube] Fix uploader extraction 2014-02-11 14:20:41 +01:00
Arjun Sreedharan c5ba203e23 [xtube] use unicode_literals 2014-02-11 13:51:37 +01:00
Arjun Sreedharan 2317e6b2b3 [yahoo] use unicode_literals 2014-02-11 13:51:23 +01:00
Sergey M. cb38928974 [firsttv] Skip test 2014-02-11 10:26:52 +07:00
Sergey M. fa78f13302 [streamcz] Minor changes 2014-02-11 10:19:02 +07:00
Sergey M 18395217c4 Merge branch '_stream' of https://github.com/pulpe/youtube-dl into pulpe-_stream 2014-02-11 09:18:46 +07:00
Jaime Marquínez Ferrándiz 34bd987811 [freesound] Modernize 2014-02-10 21:03:14 +01:00
Jaime Marquínez Ferrándiz af6ba6a1c4 [exfm] Modernize 2014-02-10 21:00:37 +01:00
Jaime Marquínez Ferrándiz 85409a0c69 [dotsub] Modernize 2014-02-10 20:52:53 +01:00
Jaime Marquínez Ferrándiz ebfe352b62 [breakcom] Modernize 2014-02-10 20:48:46 +01:00
Jaime Marquínez Ferrándiz fde56d2f17 [howcast] Modernize 2014-02-10 20:45:17 +01:00
Jaime Marquínez Ferrándiz 3501423dfe [googleplus] Modernize and simplify 2014-02-10 20:36:11 +01:00
Jaime Marquínez Ferrándiz 0de668af51 [instagram] Modernize 2014-02-10 20:24:12 +01:00
Sergey M. 2a584ea90a [firsttv] Fix video URL regex 2014-02-11 00:49:37 +07:00
Sergey M. 0f6ed94a15 [firsttv] Add support for 1tv.ru videoarchive 2014-02-11 00:20:41 +07:00
Sergey M. bcb891e82b [lifenews] Minor improvements 2014-02-10 21:07:41 +07:00
Jaime Marquínez Ferrándiz ac6e4ca1ed [brightcove] Unescape html entities from the 'og:video' url property (fixes #2360) 2014-02-10 07:50:10 +01:00
Filippo Valsorda e70dc1d14b [youtube] Correct a minor regex typo 2014-02-10 01:30:47 +01:00
pulpe 0793a7b3c7 [StreamCZ] Add support for stream.cz 2014-02-09 18:37:12 +01:00
Philipp Hagemeister 81c2f20b53 [youtube] Correct invalid JSON (Fixes #2353) 2014-02-09 17:56:10 +01:00
Jaime Marquínez Ferrándiz 1afe753462 [slideshare] Fix description extraction and modernize
The ‘og:description’  property doesn’t contain the full description
2014-02-09 14:23:19 +01:00
Jaime Marquínez Ferrándiz 524c2c716a [bloomberg] Fix extraction of ooyala embed code 2014-02-09 14:11:45 +01:00
Sergey M. b542d4bbd7 [kontrtube] Add support for kontrtube.ru (Closes #2354) 2014-02-09 19:53:11 +07:00
Jaime Marquínez Ferrándiz a97bcd80ba Add an extractor for syfy.com
It uses theplatfrom.com, which has been updated to work with f4m manifests
2014-02-08 22:30:00 +01:00
Sergey M. 17968e444c [bbc.co.uk] Fix TV episode test 2014-02-09 04:04:21 +07:00
Sergey M 2e3fd9ec2f [bbc.co.uk] Improve overall extractor structure, add subtitles support
(#2184)

Everything from http://www.bbc.co.uk/iplayer/ should be downloadable
now.
2014-02-09 04:00:49 +07:00
Philipp Hagemeister 9766538124 [jadorecettepub] Add extractor (Fixes #2148) 2014-02-08 19:20:23 +01:00
Philipp Hagemeister 98dbee8681 [jeuxvideo] Modernize 2014-02-08 18:43:12 +01:00
Philipp Hagemeister 6828d37c41 Merge branch 'master' of github.com:rg3/youtube-dl 2014-02-08 18:37:53 +01:00
Philipp Hagemeister bf5f610099 [pbs] Add support for viralplayer links (Fixes #2350) 2014-02-08 18:37:33 +01:00
Sergey M. 8b7f73404a [bbc.co.uk] Fix regex 2014-02-08 22:55:43 +07:00
Sergey M 85cacb2f51 [bbc.co.uk] Add one more link format 2014-02-08 22:54:05 +07:00
Sergey M. 082c6c867a [bbc.co.uk] Add support for bbc.co.uk radio programmes (Closes #2184) 2014-02-08 21:55:28 +07:00
Filippo Valsorda 03fcf1ab57 Merge pull request #2342 from MikeCol/tube8
[Tube8] Extended valid urls schema
2014-02-08 04:00:50 +01:00
MikeCol 3b00dea5eb Extended valid urls schema 2014-02-08 00:09:26 +01:00
Philipp Hagemeister 8bc6c8e3c0 [chilloutzone] Add additional tests (#2340) 2014-02-07 15:42:31 +01:00
Sergey M. 79bc27b53a [channel9] Simplify 2014-02-07 19:41:18 +07:00
Sergey M. 84dd703199 [ivi] Simplify 2014-02-07 19:36:50 +07:00
Sergey M. c6fdba23a6 [nfb] Add workaround for python2.6 2014-02-07 19:23:53 +07:00
Andreas Schmitz c1e672d121 [chilloutzone] fixes bug with youtube extraction
the id used for extracting the video from youtube is stored in
native_video_id not video_id. This id is only used on chilloutzone.net
2014-02-07 12:29:58 +01:00
Philipp Hagemeister d914d9d187 [chilloutzone] Add import 2014-02-07 12:03:19 +01:00
Philipp Hagemeister 4a9540b6d2 [chilloutzone] Simplify (#2338) 2014-02-07 12:00:25 +01:00
Philipp Hagemeister 9f31be7000 Merge remote-tracking branch 'Fnordlab/chilloutzone' 2014-02-07 11:50:26 +01:00
Andreas Schmitz cd8662de22 [chilloutzone] Bug fix, runs against tests
Fixes a bug with python3.3 and made the extractor run successfully
against tox
2014-02-06 21:31:04 +01:00
Sergey M. 3587159614 [nfb] Add encode POST data 2014-02-07 02:13:04 +07:00
Jaime Marquínez Ferrándiz d67cc9fa7c [youtube:playlist] Recognize ‘top tracks’ urls (closes #2332)
The list parameter starts with ‘MC’ and can have more characters after it, including dots
2014-02-06 19:46:26 +01:00
Sergey M. bf3a2fe923 [elpais] Fix typo 2014-02-07 00:38:29 +07:00
Sergey M. e9ea0bf123 [ndr] Add support for ndr.de (Closes #2325) 2014-02-07 00:35:26 +07:00
Sergey M. 0bf35c5cf5 [nfb] Add support for onf.ca URLs 2014-02-06 21:41:31 +07:00
Sergey M. 95c29381eb [mooshare] Fix bogus video page URL 2014-02-06 21:26:12 +07:00
Sergey M. 94c4abce7f [nfb] Add support for nfb.ca (Closes #2069) 2014-02-06 21:19:13 +07:00
Andreas Schmitz 46a073bfac [chilloutzone] Added support for chilloutzone.net
Added support for chilloutzone.net videos including embedded youtube
and vimeo movies. In case you find a not working movie, drop me an
email.
2014-02-06 11:44:44 +01:00
Philipp Hagemeister 5de90176d9 [elpais] Add extractor 2014-02-06 11:29:46 +01:00
Philipp Hagemeister e9e4f30d26 [pbs] Remove unused import 2014-02-06 04:19:43 +01:00
Philipp Hagemeister 83cebd73d4 [collegehumor] We only get shortened descriptions now 2014-02-06 04:16:22 +01:00
Philipp Hagemeister 1df4229bd7 [mtv/gametrailers] Change order of title preference
It looks like the plain title is better again
2014-02-06 04:15:12 +01:00
Philipp Hagemeister 7c62b568a2 Merge branch 'master' of github.com:rg3/youtube-dl 2014-02-06 03:30:18 +01:00
Philipp Hagemeister ccf9114e84 [googlesearch] Fix start, and skip playlists (Fixes #2329) 2014-02-06 03:29:10 +01:00
Jaime Marquínez Ferrándiz d8061908bb [ina] Improve _VALID_URL regex (fixes #2328)
Accept all letters in upper case and don’t require anything after the id
2014-02-05 23:01:24 +01:00
Philipp Hagemeister 6cb38a9994 [firstpost] Add extractor (Fixes #2324) 2014-02-05 21:23:21 +01:00
Sergey M. fa7df757a7 [thisav] Simplify and use unicode literals 2014-02-05 19:13:06 +07:00
Sergey M. 8c82077619 [toutv] Use unicode literals 2014-02-05 19:02:03 +07:00
Sergey M. e5d1f9e50a [m6] Add support for m6.fr (Closes #2313) 2014-02-05 17:38:17 +07:00
Jaime Marquínez Ferrándiz de563c9da0 [ina] Simplify
Download the feed with ‘_download_xml’ to make the extraction easier
2014-02-04 23:15:36 +01:00
Jaime Marquínez Ferrándiz 50451f2a18 [vbox7] simplify 2014-02-04 23:02:53 +01:00
Jaime Marquínez Ferrándiz 9bc70948e1 [statigram] Simplify 2014-02-04 22:52:27 +01:00
Jaime Marquínez Ferrándiz 5dc733f071 [vine] Simplify 2014-02-04 22:02:15 +01:00
Jaime Marquínez Ferrándiz 20650c8654 [youtube] signatures: Recognize javascript functions that contain “$” (fixes #2304) 2014-02-04 21:38:50 +01:00
Philipp Hagemeister acf1555d76 Merge remote-tracking branch 'origin/master' 2014-02-04 16:33:06 +01:00
Philipp Hagemeister 22e7f1a6ec [pbs] Add support for article pages (Fixes #870) 2014-02-04 16:31:00 +01:00
Sergey M. 3c49325658 [lifenews] Fix video URL extraction (Closes #2302) 2014-02-04 21:31:25 +07:00
Sergey M bb1cd2bea1 [mooshare] Add support for mooshare.biz (Closes #2149) 2014-02-04 20:53:46 +07:00
Philipp Hagemeister fdf1f8d4ce [collegehumor] Adapt test to changed video description 2014-02-04 10:37:01 +01:00
Philipp Hagemeister 117c8c6b97 [bliptv] Remove unused imports 2014-02-04 10:25:19 +01:00
Philipp Hagemeister 5cef4ff09b [subtittles] Check that the result is not empty 2014-02-04 10:24:17 +01:00
Philipp Hagemeister 91264ce572 [iprima] Use centralized format sorting 2014-02-04 10:24:00 +01:00
Philipp Hagemeister c79ef8e1ae Merge remote-tracking branch 'pulpe/_iprima' 2014-02-04 10:21:42 +01:00
Philipp Hagemeister 58d915df51 [traileraddict] mark as broken
traileraddict has changed their URL encoding scheme.
I'm working on restoring support, but that may take some time.
2014-02-04 10:13:52 +01:00
pulpe 7881a64499 [iprima] Add support for play.iprima.cz 2014-02-04 07:45:41 +01:00
Philipp Hagemeister 99877772d0 [generic] Add support for multiple brightcove URLs (Fixes #2283) 2014-02-03 15:19:40 +01:00
Sergey M. b0268cb6ce [vimeo] Remove superfluous whitespace 2014-02-03 20:24:11 +07:00
Sergey M. 1eac553e7e [vimeo] Add support for subtitles (Closes #2239) 2014-02-03 20:02:58 +07:00
Philipp Hagemeister 8e93b9b9aa Merge remote-tracking branch 'origin/master'
Conflicts:
	youtube_dl/extractor/bliptv.py
2014-02-03 05:19:28 +01:00
Philipp Hagemeister b4bcffefa3 [blip.tv] Add support for subtitles (#2274) 2014-02-03 05:18:30 +01:00
Filippo Valsorda 2b39af9b4f [BlipTV] Add a test case w/ subtitles (#2274) 2014-02-03 02:41:59 +01:00
Filippo Valsorda 23fe495feb Merge pull request #2274 from z00nx/master
[bliptv] Filter out SRT files
2014-02-02 17:31:57 -08:00
Sergey M b5dbe89bba Merge branch 'master' of https://github.com/rg3/youtube-dl 2014-02-03 01:22:41 +07:00
Sergey M. dbe80ca7ad [tinypic] Add support for tinypic.com videos (Closes #2210) 2014-02-03 01:20:03 +07:00
Jaime Marquínez Ferrándiz 009a3408f5 [cspan] Fix extraction (fixes #2291)
The webpage urls have changed.
The title and thumbnail are now extracted from an xml.
2014-02-02 18:24:20 +01:00
dst b58e3c8918 [vube] Use 'id' and 'ext' instead of 'file' 2014-02-02 20:04:44 +07:00
Philipp Hagemeister 56b6faf91e [traileraddict] Fix extraction 2014-02-02 12:52:47 +01:00
Philipp Hagemeister 7ac1f877a7 [collegehumor] Fix test
The description simply changed, our code is working fine
2014-02-02 12:43:09 +01:00
Philipp Hagemeister d55433bbfd Remove unused imports and simplify 2014-02-02 12:03:36 +01:00
Philipp Hagemeister f0ce2bc1c5 Merge remote-tracking branch 'dstftw/vube' 2014-02-02 11:54:23 +01:00
Filippo Valsorda c3bc00b90e [Normalboots] Update test video description 2014-02-02 07:17:48 +01:00
Filippo Valsorda ff6b7b049b Merge pull request #2279 from prutz1311/master
Added support for normalboots.com (#2237)
2014-02-01 22:16:37 -08:00
dst f46359121f [vube] Make video description optional as it may be missing 2014-02-02 12:03:55 +07:00
dst 37c1525c17 [vube] Remove unnecessary coding cookie 2014-02-02 10:49:38 +07:00
dst c85e4cf7b4 [vube] Add support for vube.com (Closes #2285) 2014-02-02 08:33:24 +07:00
Jaime Marquínez Ferrándiz c66dcda287 Merge pull request #2282 from dstftw/lifenews
[lifenews] Add support for lifenews.ru and fix og content extraction regex
2014-01-31 10:23:46 -08:00
dst 6d845922ab [lifenews] Fix test title 2014-02-01 01:10:15 +07:00
Oleg Prutz 2949cbe036 Update normalboots.py
fixed
2014-01-31 16:51:34 +03:00
Jaime Marquínez Ferrándiz c3309a7774 [collegehumor] fix test description 2014-01-31 14:48:49 +01:00
Jaime Marquínez Ferrándiz 7aed837595 [ro220] Simplify and use unicode_literals 2014-01-31 14:07:58 +01:00
Jaime Marquínez Ferrándiz 0eb799bae9 [ustream] Simplify and use unicode_literals 2014-01-31 14:05:33 +01:00
Jaime Marquínez Ferrándiz 4baff4a4ae [spiegel] Simplify and use unicode_literals 2014-01-31 14:00:55 +01:00
Jaime Marquínez Ferrándiz 45d7bc2f8b [vevo] Simplify and use unicode_literals 2014-01-31 13:56:45 +01:00
dst c1206423c4 Fix extraction of og content in single quotes 2014-01-31 03:57:33 +07:00
dst 659aa21ba1 [lifenews] Add support for lifenews.ru 2014-01-31 03:48:00 +07:00
Oleg Prutz 3bf8bc7f37 Update normalboots.py
_TEST added
2014-01-30 23:01:35 +03:00
Jaime Marquínez Ferrándiz b9381e43c2 Fix the extraction of full-episodes urls from southpark.com (fixes #2278)
Added an additional regex to the generic _real_extract method of MTVServicesInfoExtractor
2014-01-30 19:04:33 +01:00
Jaime Marquínez Ferrándiz fcdea2666d [collegehumor] Add support for embedded youtube videos (fixes #2277) 2014-01-30 18:33:49 +01:00
Jaime Marquínez Ferrándiz c4db377cbb [collegehumor] The video may not contain any file in webm format (#2277)
For example http://www.collegehumor.com/video/5812266
2014-01-30 18:33:49 +01:00
Oleg Prutz c81a855b0f Added support for normalboots.com 2014-01-30 21:26:50 +04:00
z00nx 0 4f879a5be0 [bliptv] Filter out SRT files 2014-01-30 20:44:53 +11:00
Philipp Hagemeister 1a0648b4a9 [malemotion] Disable test case
I am not going to look for an alternative one, but feel free to suggest one.
2014-01-30 06:15:50 +01:00
Philipp Hagemeister 3c1b4669d0 [francetv] Use unicode_literals 2014-01-30 06:13:57 +01:00
Philipp Hagemeister 24b3d5e538 [francetvinfo.fr] Support more ID suffixes 2014-01-30 06:12:56 +01:00
Philipp Hagemeister ab083b08ab [generic] remove testcase
The video seems to have been removed from the site.
2014-01-30 06:10:57 +01:00
Philipp Hagemeister 89acb96927 [liveleak] Support old and new URLs 2014-01-30 06:09:06 +01:00
Philipp Hagemeister 55b41c723c Merge branch 'master' of github.com:rg3/youtube-dl 2014-01-30 05:30:16 +01:00
Philipp Hagemeister 9f8928d032 [generic] Match JWPlayerOptions
This adds support for The Guardian, among others
Closes #2271, fixes #2267
2014-01-30 05:29:10 +01:00
Philipp Hagemeister 3effa7ceaa Merge pull request #2273 from dstftw/crunchyroll
[crunchyroll] Add support for mobile URLs and use unicode literals
2014-01-29 20:15:38 -08:00
Philipp Hagemeister 975fa541c2 [liveleak] Support multiple formats (Fixes #2262) 2014-01-30 04:52:50 +01:00
dst 38a40276ec [crunchyroll] Add support for mobile URLs and use unicode literals 2014-01-30 05:23:44 +07:00
dst 57b6288358 [comedycentral] Improve regexes 2014-01-30 04:33:00 +07:00
dst c3f51436bf Improve some regexes for embedded players 2014-01-30 04:26:46 +07:00
Jaime Marquínez Ferrándiz 0c708f11cb [bloomberg] Fix ooyala url extraction
Added a helper method to InfoExtractor for searching the ‘twitter:player’ meta property.
Now the OoyalaIE also recognizes the ‘ec’ parameter in the url as the embed code.
2014-01-29 18:03:32 +01:00
Jaime Marquínez Ferrándiz fb2a706d11 [myspass] Simplify and use unicode_literals 2014-01-29 16:59:22 +01:00
Jaime Marquínez Ferrándiz 0b76600deb [youjizz] Simplify and use unicode_literals 2014-01-29 16:59:21 +01:00
Jaime Marquínez Ferrándiz 245b612a36 [rbmaradio] Simplify and use unicode_literals 2014-01-29 16:59:10 +01:00
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