Jaime Marquínez Ferrándiz
fb7cb6823e
Remove the SubtitlesInfoExtractor class
...
No longer needed
2015-02-19 23:24:24 +01:00
Sergey M․
dd0a58f5f0
[blinkx] Fix extraction
2015-02-20 01:19:38 +06:00
Philipp Hagemeister
a21420389e
release 2015.02.19.3
2015-02-19 19:28:17 +01:00
Jaime Marquínez Ferrándiz
6140baf4e1
[nationalgeographic] Add extractor ( closes #4960 )
2015-02-19 18:17:31 +01:00
Sergey M․
8fc642eb5b
[pornhub] Fix uploader regex
2015-02-19 22:15:49 +06:00
Sergey M․
e66e1a0046
[pornhub] Add support for playlists ( Closes #4995 )
2015-02-19 22:15:19 +06:00
Sergey M․
d5c69f1da4
[5min] Cover joystiq.com URLs ( Closes #4962 )
2015-02-19 21:47:11 +06:00
Jaime Marquínez Ferrándiz
f13b1e7d7f
[bbccouk] Convert to new subtitles system
...
I haven't found any video available outside the UK, so I haven't added tests.
I have updated how the srt file is build, because (at least for www.bbc.co.uk/programmes/p02j9b69) the subtitles is inside 'span' elements.
2015-02-19 16:46:41 +01:00
Jaime Marquínez Ferrándiz
5c8a3f862a
[nbc] Use a test video that works outside the US
2015-02-19 15:00:39 +01:00
Jaime Marquínez Ferrándiz
8807f1277f
[theplatform] Convert to new subtitles system
2015-02-19 14:54:50 +01:00
Jaime Marquínez Ferrándiz
a3b9157f49
[cbssports] Add extractor ( closes #4996 )
2015-02-19 13:06:53 +01:00
Philipp Hagemeister
b88ba05356
[imgur] Simplify
2015-02-19 05:53:09 +01:00
Philipp Hagemeister
b74d505577
Merge remote-tracking branch 'jbboehr/imgur-gifv-improvements'
2015-02-19 05:16:11 +01:00
John Boehr
9e2d7dca87
[imgur] improve error check for non-video URLs
2015-02-18 19:47:54 -08:00
John Boehr
d236b37ac9
[imgur] improve regex #4998
2015-02-18 19:28:19 -08:00
Philipp Hagemeister
e880c66bd8
[theonion] Modernize
2015-02-19 04:12:40 +01:00
John Boehr
1a13940c8d
[imgur] support regular URL
2015-02-18 18:12:48 -08:00
Philipp Hagemeister
3d54788495
[webofstories] Fix extraction
2015-02-19 02:12:08 +01:00
Philipp Hagemeister
71d53ace2f
[sockshare] Do not require thumbnail anymore
...
Thumbnail is not present on the website anymore.
2015-02-19 02:04:30 +01:00
Philipp Hagemeister
f37e3f99f0
[generic] Correct test case
...
Video has been reuploaded / edited
2015-02-19 02:00:52 +01:00
Philipp Hagemeister
bd03ffc16e
[netzkino] Skip download in test case
...
Works fine from Germany, but fails from everywhere else
2015-02-19 01:58:54 +01:00
Philipp Hagemeister
1ac1af9b47
release 2015.02.19.2
2015-02-19 01:43:28 +01:00
Philipp Hagemeister
3bf5705316
[imgur] Add new extractor
2015-02-19 01:43:20 +01:00
Philipp Hagemeister
1c2528c8a3
[cbs] Modernize
2015-02-19 01:22:50 +01:00
Philipp Hagemeister
7bd15b1a03
release 2015.02.19.1
2015-02-19 01:04:24 +01:00
Philipp Hagemeister
6b961a85fd
[patreon] Add support for embedlies ( fixes #4969 )
2015-02-19 01:04:19 +01:00
Philipp Hagemeister
7707004043
[patreon] Modernize
2015-02-19 00:38:05 +01:00
Philipp Hagemeister
a025d3c5a5
release 2015.02.19
2015-02-19 00:31:23 +01:00
Philipp Hagemeister
c460bdd56b
[sandia] Add new extractor ( #4974 )
2015-02-19 00:31:01 +01:00
Philipp Hagemeister
b81a359eb6
[YoutubeDL] Use render_table for format listing
2015-02-19 00:28:58 +01:00
Philipp Hagemeister
d61aefb24c
Merge remote-tracking branch 'origin/master'
2015-02-19 00:01:14 +01:00
Philipp Hagemeister
d305dd73a3
[utils] Fix js_to_json
...
Previously, the runtime could be atrocious for longer inputs.
2015-02-18 23:59:51 +01:00
Jaime Marquínez Ferrándiz
93a16ba238
[vimeo] Raise the ExtractorError with expected=True when no video password is given
2015-02-18 22:00:12 +01:00
Jaime Marquínez Ferrándiz
4f7cea6c53
[viki] Convert to new subtitles system
2015-02-18 20:37:16 +01:00
Jaime Marquínez Ferrándiz
afbdd3acc3
[rai] Convert to new subtitles system
2015-02-18 20:14:42 +01:00
Philipp Hagemeister
85d5866177
[yahoo] Remove md5sum from test case
...
The md5 sum has changed repeatedly, and we check whether it looks like a video anyways nowadays.
2015-02-18 20:03:04 +01:00
Philipp Hagemeister
9789d7535d
[xtube] Fix test case
2015-02-18 19:58:41 +01:00
Philipp Hagemeister
d8443cd3f7
[wsj] Correct test case
2015-02-18 19:56:24 +01:00
Philipp Hagemeister
d47c26e168
[brightcove] Correct keys in playlists
2015-02-18 19:56:10 +01:00
Jaime Marquínez Ferrándiz
01561da142
[nrk] Convert to new subtitles system
2015-02-18 18:57:01 +01:00
Jaime Marquínez Ferrándiz
0af25f784b
[mtv] Convert to new subtitles system
2015-02-18 18:27:45 +01:00
Jaime Marquínez Ferrándiz
b9b42f2ea0
[npo] Convert to new subtitles system
2015-02-18 17:57:10 +01:00
Jaime Marquínez Ferrándiz
311c393838
[lynda] Convert to new subtitles system
2015-02-18 17:46:33 +01:00
Jaime Marquínez Ferrándiz
18c1c42405
[drtv] Convert to new subtitles system
2015-02-18 17:20:22 +01:00
Jaime Marquínez Ferrándiz
37dd5d4629
[mit] Don't set the subtitles field
...
YouTube already provides them in more formats
2015-02-18 17:19:56 +01:00
Philipp Hagemeister
81975f4693
release 2015.02.18.1
2015-02-18 10:54:56 +01:00
Philipp Hagemeister
3eff81fbf7
[jsinterp] Disable comment support
...
We need a proper lexer to be able to understand YouTube's code, which contains /* inside of strings.
For now it's sufficient to just disable comment support altogether.
Fixes #4976 , fixes #4979 , fixes #4980 , fixes #4981 , fixes #4982 .
Closes #4977 .
2015-02-18 10:47:42 +01:00
Philipp Hagemeister
785521bf4f
[youtube] Remove useless if
2015-02-18 10:42:23 +01:00
Philipp Hagemeister
6d1a55a521
[youtube] Show entire player URL when -v is given
2015-02-18 10:39:14 +01:00
Philipp Hagemeister
9cad27008b
release 2015.02.18
2015-02-18 00:49:34 +01:00
Philipp Hagemeister
11e611a7fa
Extend various playlist tests
2015-02-18 00:49:10 +01:00
Philipp Hagemeister
72c1f8de06
[bandcamp:album] Fix extractor results and associated test
2015-02-18 00:48:52 +01:00
Philipp Hagemeister
6e99868e4c
[buzzfeed] Fix playlist test case
2015-02-18 00:41:45 +01:00
Philipp Hagemeister
4d278fde64
[ign] Amend playlist test
2015-02-18 00:38:55 +01:00
Philipp Hagemeister
1def5f359e
[livestream] Correct playlist ID and add a test for it
2015-02-18 00:34:45 +01:00
Philipp Hagemeister
15ec669374
[vk] Amend playlist test
2015-02-18 00:33:41 +01:00
Philipp Hagemeister
a3fa5da496
[vimeo] Amend playlist tests
2015-02-18 00:33:31 +01:00
Philipp Hagemeister
30965ac66a
[vimeo] Prevent infinite loops if video password verification fails
...
We're seeing this in the tests¹ right now, which do not terminate.
¹ https://travis-ci.org/jaimeMF/youtube-dl/jobs/51135858
2015-02-18 00:27:58 +01:00
Philipp Hagemeister
09ab40b7d1
Merge branch 'progress-as-hook2'
2015-02-17 23:41:48 +01:00
Jaime Marquínez Ferrándiz
edab9dbf4d
[YoutubeDL] use the 'render_table' function for listing the subtitles
2015-02-17 22:59:19 +01:00
Jaime Marquínez Ferrándiz
9868ea4936
[extractor/common] Simplify subtitles handling methods
...
Initially I was going to use a single method for handling both subtitles and automatic captions, that's why I used the 'list_subtitles' and the 'subtitles' variables.
2015-02-17 22:16:29 +01:00
Jaime Marquínez Ferrándiz
85920dd01d
[bliptv] Convert to new subtitles system
2015-02-17 21:56:25 +01:00
Philipp Hagemeister
fa15607773
PEP8 fixes
2015-02-17 21:46:20 +01:00
Philipp Hagemeister
a91a2c1a83
[downloader] Remove various unneeded assignments and imports
2015-02-17 21:44:41 +01:00
Philipp Hagemeister
16e7711e22
[downloader/http] Remove gruesome import
2015-02-17 21:42:31 +01:00
Philipp Hagemeister
5cda4eda72
[YoutubeDL] Use a progress hook for progress reporting
...
Instead of every downloader calling two helper functions, let our progress report be an ordinary progress hook like everyone else's.
Closes #4875 .
2015-02-17 21:40:35 +01:00
Philipp Hagemeister
98f000409f
[radio.de] Fix extraction
2015-02-17 21:40:09 +01:00
Jaime Marquínez Ferrándiz
bd7fe0cf66
[walla] Convert to new subtitles system
2015-02-17 21:23:09 +01:00
Jaime Marquínez Ferrándiz
48246541da
[ceskatelevize] Convert to new subtitles system
2015-02-17 21:17:47 +01:00
Sergey M․
4a8d4a53b1
[videolecturesnet] Fix rtmp stream glitches ( Closes #4968 )
2015-02-18 01:16:49 +06:00
Jaime Marquínez Ferrándiz
4cd95bcbc3
[twitch:stream] Prefer the 'source' format ( fixes #4972 )
2015-02-17 18:57:01 +01:00
Philipp Hagemeister
be24c8697f
release 2015.02.17.2
2015-02-17 17:38:31 +01:00
Sergey M?
0d93378887
[videolecturesnet] Check http format URLs ( Closes #4968 )
2015-02-17 22:35:27 +06:00
Sergey M?
4069766c52
[extractor/common] Test URLs with GET
2015-02-17 22:35:27 +06:00
Philipp Hagemeister
7010577720
release 2015.02.17.1
2015-02-17 17:35:08 +01:00
Philipp Hagemeister
8ac27a68e6
[hls] Switch to available as a property
2015-02-17 17:35:03 +01:00
Philipp Hagemeister
46312e0b46
release 2015.02.17
2015-02-17 17:29:32 +01:00
Philipp Hagemeister
f9216ed6ad
Merge remote-tracking branch 'origin/master'
2015-02-17 17:28:51 +01:00
Philipp Hagemeister
65bf37ef83
[ffmpeg] Remove trivial helper method
2015-02-17 17:27:29 +01:00
Philipp Hagemeister
f740fae2a4
[ffmpeg] Make available a property
2015-02-17 17:26:41 +01:00
Jaime Marquínez Ferrándiz
fbc503d696
[downloader/hls] Fix detection of ffmpeg/avconv (reported in #4966 )
2015-02-17 16:40:42 +01:00
Jaime Marquínez Ferrándiz
662435f728
[YoutubeDL] Use a Request object for getting the cookies ( fixes #4970 )
...
So that we don't have to implement all the methods used by the cookiejar.
2015-02-17 16:29:24 +01:00
Jaime Marquínez Ferrándiz
163d966707
[downloader/external] curl: Add the '--location' flag
...
curl doesn't follow redirections by default
2015-02-17 16:21:02 +01:00
Philipp Hagemeister
85729c51af
[downloader] Add --hls-prefer-native to use the native HLS downloader ( #4966 )
2015-02-17 12:09:12 +01:00
Jaime Marquínez Ferrándiz
360e1ca5cc
[youtube] Convert to new subtitles system
...
The automatic captions are stored in the 'automactic_captions' field, which is used if no normal subtitles are found for an specific language.
2015-02-16 22:47:39 +01:00
Jaime Marquínez Ferrándiz
a1f2a06b34
[dailymotion] Convert to new subtitles system
2015-02-16 21:51:08 +01:00
Jaime Marquínez Ferrándiz
c84dd8a90d
[YoutubeDL] store the subtitles to download in the 'requested_subtitles' field
...
We need to keep the orginal subtitles information, so that the '--load-info' option can be used to list or select the subtitles again.
We'll also be able to have a separate field for storing the automatic captions info.
2015-02-16 21:51:08 +01:00
Jaime Marquínez Ferrándiz
65469a7f8b
[vimeo] Convert to new subtitles system
...
Removed some tests, the behaviour should be checked in a test for the YoutubeDL class
2015-02-16 21:51:07 +01:00
Jaime Marquínez Ferrándiz
6b597516c1
[atresplayer] Convert to new subtitles system
2015-02-16 21:51:07 +01:00
Jaime Marquínez Ferrándiz
b5857f62e2
[crunchyroll] Convert to new subtitles system
2015-02-16 21:51:07 +01:00
Jaime Marquínez Ferrándiz
a504ced097
Improve subtitles support
...
For each language the extractor builds a list with the available formats sorted (like for video formats), then YoutubeDL selects one of them using the '--sub-format' option which now allows giving the format preferences (for example 'ass/srt/best').
For each format the 'url' field can be set so that we only download the contents if needed, or if the contents needs to be processed (like in crunchyroll) the 'data' field can be used.
The reasons for this change are:
* We weren't checking that the format given with '--sub-format' was available, checking it in each extractor would be repetitive.
* It allows to easily support giving a format preference.
* The subtitles were automatically downloaded in the extractor, but I think that if you use for example the '--dump-json' option you want to finish as fast as possible.
Currently only the ted extractor has been updated, but the old system still works.
2015-02-16 21:51:03 +01:00
Philipp Hagemeister
1db5fbcfe3
release 2015.02.16.1
2015-02-16 15:47:13 +01:00
Philipp Hagemeister
59b8ab5834
[rtlnl|generic] Add support for rtl.nl embeds ( Fixes #4959 )
2015-02-16 15:45:45 +01:00
Philipp Hagemeister
a568180441
release 2015.02.16
2015-02-16 04:51:20 +01:00
Philipp Hagemeister
85e80f71cd
[yam] Allow faults in optional fields ( #4943 )
2015-02-16 04:50:57 +01:00
Philipp Hagemeister
bfa6bdcd8b
Merge remote-tracking branch 'yan12125/IE_Yam'
2015-02-16 04:44:28 +01:00
Philipp Hagemeister
03cd72b007
[extractor/common] Move up filesize
...
filesize and tbr should correlate, so it doesn't make sense to treat them differently.
2015-02-16 04:39:22 +01:00
Philipp Hagemeister
5bfd430f81
Merge remote-tracking branch 'origin/master'
2015-02-16 04:09:10 +01:00
Philipp Hagemeister
73fac4e911
[ffmpeg] Add --ffmpeg-location
2015-02-16 04:05:53 +01:00
Sergey M․
f813928e4b
[bbccouk] Fix fallback to legacy playlist
2015-02-15 16:32:38 +06:00
Sergey M․
b9c7a97318
[history] Add extractor ( Closes #4934 )
2015-02-15 04:57:52 +06:00
Sergey M․
9fb2f1cd6d
[theplatform] Add URL sign capability
2015-02-15 04:56:12 +06:00
Jaime Marquínez Ferrándiz
6ca7732d5e
[extractor/common] Fix link to external documentation
2015-02-14 22:20:24 +01:00
Jaime Marquínez Ferrándiz
b0ab0fac49
Remove unused imports
2015-02-14 22:19:58 +01:00
Naglis Jonaitis
a294bce82f
[streamcz] Fix extraction ( Closes #4940 )
2015-02-14 17:48:04 +02:00
Sergey M․
76d1466b08
[drtuber] Add one more title regex
2015-02-14 18:50:13 +06:00
Sergey M.
1888d3f7b3
Merge pull request #4951 from peugeot/beeg
...
[beeg] fix test
2015-02-14 18:46:49 +06:00
Sergey M.
c2787701cc
Merge pull request #4950 from peugeot/drtuber
...
[drtuber] fix extraction
2015-02-14 18:46:43 +06:00
peugeot
52e1d0ccc4
[beeg] fix test
2015-02-14 13:42:42 +01:00
peugeot
10e3c4c221
[drtuber] fix extraction
2015-02-14 13:40:35 +01:00
Sergey M․
68f2d273bf
[sunporno] Keep old video regex just in case
2015-02-14 18:33:52 +06:00
peugeot
ae1580d790
[sunporno] fix extraction
2015-02-14 13:29:44 +01:00
Sergey M․
a4f3d779db
[nbcnews] Simplify
2015-02-14 17:42:12 +06:00
Ryan Schmidt
d9aa2b784d
Support NBC Nightly News broadcasts
2015-02-14 04:10:23 -06:00
Jaime Marquínez Ferrándiz
cffcbc02de
[postprocessor/ffmpeg] Don't let ffmpeg read from stdin ( fixes #4945 )
...
If you run 'while read aurl ; do youtube-dl --extract-audio "${aurl}"; done < path_to_batch_file' (batch_file contains one url per line) each call to youtube-dl consumed some characters and 'read' would assing to 'aurl' a non valid url, something like 'tube.com/watch?v=<id>'.
2015-02-13 22:25:34 +01:00
Sergey M․
9347fddbfc
[1tv] Cover arbitraty URLs
2015-02-14 02:04:28 +06:00
Sergey M․
037e9437e4
[camdemy] Fix _VALID_URL
2015-02-13 20:10:42 +06:00
Jaime Marquínez Ferrándiz
ae6423d704
[bambuser] Fix 'uploader_id' extraction ( fixes #4944 )
2015-02-13 11:36:33 +01:00
Yen Chi Hsuan
7105440cec
[Yam] Add new extractor
2015-02-13 15:14:23 +08:00
Sergey M․
171ca612af
[npo:radio] Move to extractor to common npo place and add extractor for fragments
2015-02-13 01:36:54 +06:00
robin
c3d64fc1b3
[nporadio] Edit to confirm to flake8 standards
2015-02-12 19:28:58 +01:00
robin
7c24ce225d
[NPORadio] Added extractor for live radio
2015-02-12 19:19:55 +01:00
Philipp Hagemeister
08b38d5401
[camdemy] Simplify and make more robust ( #4938 )
...
Do not throw errors if view count or upload date extraction fails.
Dispose of re.MULTILINE, which had absolutely no effect without any ^ or $ in sight.
Follow PEP8 naming conventions.
2015-02-12 08:55:06 +01:00
Philipp Hagemeister
024c53694d
Merge remote-tracking branch 'yan12125/IE_camdemy'
2015-02-12 08:44:39 +01:00
Yen Chi Hsuan
7e6011101f
[camdemy] Python2 compatibility
2015-02-12 14:23:25 +08:00
Yen Chi Hsuan
c40feaba77
[camdemy] Add support for folders
2015-02-12 14:13:19 +08:00
Philipp Hagemeister
5277f09dfc
release 2015.02.11
2015-02-11 19:02:39 +01:00
Jaime Marquínez Ferrándiz
2d30521ab9
[youtube] Extract average rating ( closes #2362 )
2015-02-11 18:39:31 +01:00
Jaime Marquínez Ferrándiz
f36f92f4da
[aes] style: Put __all__ variable at the end of the file
2015-02-11 18:15:15 +01:00
Sergey M․
124f3bc67d
[dotsub] Fix extraction and modernize
2015-02-11 22:33:03 +06:00
Yen Chi Hsuan
8367d3f3cb
[camdemy] Detection of external sources
2015-02-12 00:11:33 +08:00
Sergey M․
c56d7d899d
[dctptv] Skip rtmp download
2015-02-11 22:10:33 +06:00
Naglis Jonaitis
ea5db8469e
[canalplus] Add support for itele.fr URLs ( Closes #4931 )
2015-02-11 16:21:52 +02:00
Naglis Jonaitis
3811c567e7
[teamcoco] Fix video id extraction
2015-02-11 15:47:19 +02:00
Yen Chi Hsuan
8708d76425
[camdemy] Add new extractor
...
Single file download done, while folder extaction in plan
2015-02-11 16:39:15 +08:00
Sergey M․
054fe3cc40
[ntvru] Adapt to new direct delivery and modernize ( Closes #4918 )
2015-02-10 21:35:34 +06:00
Philipp Hagemeister
af0d11f244
release 2015.02.10.5
2015-02-10 15:56:04 +01:00
Philipp Hagemeister
9650885be9
[escapist] Filter video differently ( Fixes #4919 )
2015-02-10 15:55:51 +01:00
Philipp Hagemeister
596ac6e31f
[escapist] Modernize
2015-02-10 15:45:36 +01:00
Philipp Hagemeister
612ee37365
release 2015.02.10.4
2015-02-10 11:28:34 +01:00
Philipp Hagemeister
442c37b7a9
[YoutubeDL] Do not perform filter matching on partial results ( Fixes #4921 )
2015-02-10 11:28:28 +01:00
Philipp Hagemeister
04bbe41330
release 2015.02.10.3
2015-02-10 05:42:47 +01:00
Philipp Hagemeister
8f84f57183
[ccc] Add new extractor ( Fixes #4890 )
2015-02-10 05:42:41 +01:00
Philipp Hagemeister
c0e1a415fd
[firstpost] Modernize
2015-02-10 05:28:48 +01:00
Philipp Hagemeister
bf8f082a90
[vimeo:album] Add support for album passwords ( Fixes #4917 )
2015-02-10 04:53:21 +01:00
Philipp Hagemeister
2f543a2142
[options] Add alias --dump-header for --print-traffic
2015-02-10 04:52:33 +01:00
Philipp Hagemeister
7e5db8c930
[options] Add --no-color
2015-02-10 04:22:10 +01:00
Philipp Hagemeister
f7a211dcc8
[pornhd] Fix extraction ( fixes #4915 )
2015-02-10 03:41:31 +01:00
Philipp Hagemeister
845734773d
release 2015.02.10.2
2015-02-10 03:32:55 +01:00
Philipp Hagemeister
347de4931c
[YoutubeDL] Add generic video filtering ( Fixes #4916 )
...
This functionality is intended to eventually encompass the current format filtering.
2015-02-10 03:32:24 +01:00
Philipp Hagemeister
8829650513
release 2015.02.10.1
2015-02-10 01:46:09 +01:00
Philipp Hagemeister
c73fae1e2e
[commonmistakes] Detect BOMs at the beginning of URLs
...
Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1093517 .
2015-02-10 01:40:55 +01:00
Philipp Hagemeister
834bf069d2
[bandcamp] Correct variable name
2015-02-10 01:37:14 +01:00
Philipp Hagemeister
c06a9fa34f
Use snake_case instead of camelCase
2015-02-10 01:36:38 +01:00
Philipp Hagemeister
753fad4adc
[commonmistakes] Correct logic error
2015-02-10 01:34:01 +01:00
Philipp Hagemeister
34814eb66e
release 2015.02.10
2015-02-10 01:19:52 +01:00
Philipp Hagemeister
3a5bcd0326
[extractor/common] Wrap extractor errors ( Fixes #1194 )
...
For now, we just wrap some common errors. More may follow. We do not want to catch actual programming errors in the extractors, such as 1 // 0.
2015-02-10 01:17:23 +01:00
Philipp Hagemeister
99c2398bc6
[bandcamp] Use our API to get more stable error messages ( #1194 )
2015-02-09 19:08:51 +01:00
Philipp Hagemeister
28f1272870
[svtplay] Correct test case
2015-02-09 16:05:01 +01:00
Philipp Hagemeister
f18e3a2fc0
release 2015.02.09.3
2015-02-09 15:59:19 +01:00
Philipp Hagemeister
c4c5dc27cb
Merge branch 'master' of github.com:rg3/youtube-dl
2015-02-09 15:59:14 +01:00
Naglis Jonaitis
2caf182f37
[trilulilu] Add support for videos without category in the URL ( Closes #4067 )
...
Also, update the testcase, detect private/country restricted videos and modernize a bit.
2015-02-09 17:00:05 +02:00
Philipp Hagemeister
43f244b6d5
[YoutubeDL] Do not show worst in --list-formats output
...
Nobody wants to know what the worst possible format is. And if they do, they can still provide -f worst.
2015-02-09 15:57:42 +01:00
Philipp Hagemeister
1309b396d0
[svtplay] Add new extractor ( Fixes #4914 )
2015-02-09 15:56:59 +01:00
Jaime Marquínez Ferrándiz
ba61796458
[youtube] Don't override format info from the dash manifest ( fixes #4911 )
2015-02-09 15:04:22 +01:00
Philipp Hagemeister
3255fe7141
release 2015.02.09.2
2015-02-09 14:46:30 +01:00
Philipp Hagemeister
e98b8e79ea
[generic] Improve SBS detection ( Fixes #4899 )
2015-02-09 14:46:10 +01:00
Philipp Hagemeister
196121c51b
release 2015.02.09.1
2015-02-09 10:49:10 +01:00
Philipp Hagemeister
5269028951
[rtlnow] Add test for @mmue's extension ( #4908 )
2015-02-09 10:47:19 +01:00
Philipp Hagemeister
f7bc056b5a
Merge remote-tracking branch 'mmue/fix-rtlnow'
2015-02-09 10:44:55 +01:00
Philipp Hagemeister
a0f7198544
[generic] Add support for jwPlayer YouTube videos
...
This makes nationalarchives.gov.uk work (Fixes #4907 , fixes #4876 )
2015-02-09 10:43:01 +01:00
Philipp Hagemeister
dd8930684e
release 2015.02.09
2015-02-09 10:28:16 +01:00
Markus Müller
bdb186f3b0
fix rtlnow for newer series like "Der Bachelor" season 5
2015-02-08 21:55:39 +01:00
Sergey M․
64f9baa084
[options] Mention asr as possible filter
2015-02-09 01:35:16 +06:00
Philipp Hagemeister
b29231c040
release 2015.02.08
2015-02-08 20:28:38 +01:00
Sergey M․
6128bf07a9
[options] Update help on string comparisons
2015-02-09 01:27:27 +06:00
Sergey M․
2ec19e9558
[YoutubeDL] Allow filtering by audio sampling rate
2015-02-09 01:09:45 +06:00
Sergey M․
9ddb6925bf
[YoutubeDL] Allow filtering by string properties ( #4906 )
2015-02-09 01:07:43 +06:00
Sergey M․
41c23b0da5
[gamekings] Support videos from news pages
2015-02-08 23:12:59 +06:00
Sergey M․
d87ec897e9
[gamekings] Improve extraction
2015-02-08 23:03:12 +06:00
Sergey M․
3bd4bffb1c
Merge branch 'gamekings' of https://github.com/robin007bond/youtube-dl into robin007bond-gamekings
2015-02-08 22:46:43 +06:00
robin
c36b09a502
[Gamekings] Use thumbnail in return statement
2015-02-08 16:46:13 +01:00
Naglis Jonaitis
641eb10d34
Use _family_friendly_search for determining age_limit
2015-02-08 17:45:38 +02:00
robin
955c5505e7
[Gamekings] Use xpath
...
XPath is used for extracting the video url and the thumbnail
2015-02-08 16:44:25 +01:00
Naglis Jonaitis
69319969de
[extractor/common] Add new helper method _family_friendly_search
2015-02-08 17:39:00 +02:00
Naglis Jonaitis
a14292e848
[soulanime] Remove extractor ( #4554 )
...
Was supposed to be deleted by 67c2bcd
2015-02-08 16:57:07 +02:00
robin
5d678df64a
[Gamekings] Download playlist
...
Todo: URL and Thumbnail should be extracted with XPath
2015-02-08 15:34:37 +01:00
robin
8ca8cbe2bd
[Gamekings] Check string for vimeo, fix test
...
The test now doesn't fail anymore. It just checks the string for having
"vimeo" in it, instead of using the method for URL-checking, since it's
returns an error.
The tests don't fail, and the extractor works fine now.
2015-02-08 14:41:14 +01:00
robin
ba322d8209
[Gamekings] Added test and replaced video_url
...
Quick and dirty fix for the Gamekings extractor. It gives an error about
the video_url, but it downloads it now instead of giving a 404 error on
newer Gamekings videos
2015-02-08 14:23:37 +01:00
robin
2f38289b79
[Gamekings] Fix order of replacement string
...
Oops.
2015-02-08 13:49:32 +01:00
robin
f23a3ca699
[Gamekings] Fixed typo in URL replacement
2015-02-08 13:47:27 +01:00
robin
77d2b106cc
[Gamekings] Fix 404 when large isn't available
...
When trying to download some GameKings videos, not all worked. This was
because not all videos had a "/large"-URL available. The extractor
checks now if the /large URL is available, if it isn't, it tries to get
the normal URL.
2015-02-08 13:42:41 +01:00
Sergey M․
c0e46412e9
[aparat] Fix extraction ( Closes #4897 )
2015-02-08 17:30:29 +06:00
Jaime Marquínez Ferrándiz
b3a286d69d
[YoutubeDL] _calc_cookies: add get_header method to _PseudoRequest ( #4861 )
2015-02-06 22:23:06 +01:00
Jaime Marquínez Ferrándiz
467d3c9a0c
[ffmpeg] --extrac-audio: Use the same options for avconv and ffmpeg
...
They have been available in ffmpeg since version 0.9, and we require 1.0 or higher.
2015-02-06 22:05:11 +01:00
Naglis Jonaitis
ad5747bad1
[rtp] Construct regular HTTP download URLs ( #4882 )
2015-02-06 23:00:54 +02:00
Sergey M․
d6eb66ed3c
[aftenposten] Add extractor ( Closes #4863 )
2015-02-07 01:46:54 +06:00
Sergey M․
7f2a9f1b49
[tvigle] Add support for cloud URLs ( Closes #4887 )
2015-02-06 21:15:01 +06:00
Philipp Hagemeister
1e1896f2de
[extractor/common] Correct sort order.
...
We should look at height and width before ext_preference.
2015-02-06 15:16:45 +01:00
Philipp Hagemeister
c831973366
release 2015.02.06
2015-02-06 14:38:30 +01:00
Naglis Jonaitis
1a2548d9e9
[rtp] Pass --realtime to rtmpdump ( Fixes #4882 )
...
A workaround for video jumping back in time.
2015-02-06 13:44:46 +02:00
Sergey M․
3900eec27c
[extractor/common] Fix 2.0 manifest extraction ( Closes #4830 )
2015-02-06 04:29:29 +06:00
Sergey M․
9c91a8fa70
[tweakers] Switch extraction to xspf playlist, extract all formats and meta ( #4881 )
2015-02-06 03:23:42 +06:00
Sergey M․
41469f335e
Merge branch 'tweakers' of https://github.com/robin007bond/youtube-dl into robin007bond-tweakers
2015-02-06 02:59:33 +06:00
robin
67ce4f8820
Use match_id method instead of splitted URL
2015-02-05 21:49:13 +01:00
robin
bc63d56cca
Remove unnecessary TODO-comments
2015-02-05 21:40:18 +01:00
robin
c893d70805
Remove player-url in tweakers.py
...
Player-url only needed for rmftp, not for regular URLs
2015-02-05 21:38:35 +01:00
robin
3ee6e02564
Edit Tweakers extractor
...
Fixed code conventions (mainly adding two or more spaces before making
an inline comment)
2015-02-05 19:59:36 +01:00
robin
e3aaace400
[tweakers] Add new extractor
2015-02-05 19:55:41 +01:00
Sergey M․
300753a069
[YoutubeDL] Fix video+audio format field ( Closes #4880 )
2015-02-06 00:51:16 +06:00
Sergey M․
f13b88c616
[rts] Fix f4m and m3u8 extraction ( Closes #4873 )
2015-02-05 22:17:50 +06:00
Sergey M․
60ca389c64
[extractor/common] Prefix f4m/m3u8 entries with identifier
2015-02-05 22:16:27 +06:00
Sergey M․
9e91449c8d
[npo] Fix subtitles ( Closes #3638 )
2015-02-05 20:13:28 +06:00
Frans de Jonge
25e5ebf382
Add NPO.nl subtitles
...
Implements #3638
2015-02-05 12:51:33 +01:00
Philipp Hagemeister
7dfc356625
release 2015.02.04
2015-02-04 16:09:35 +01:00
Sergey M․
58ba6c0160
[mixcloud] Fix extraction ( Closes #4862 )
2015-02-04 19:47:55 +06:00
naglis
f076b63821
[generic/ooyala] Add support for Ooyala embeds on SBN network websites ( Fixes #4859 )
2015-02-04 15:33:37 +02:00
Philipp Hagemeister
cd7342755f
release 2015.02.03.1
2015-02-03 10:59:27 +01:00
Philipp Hagemeister
9bb8e0a3f9
[wsj] Add new extractor ( Fixes #4854 )
2015-02-03 10:58:28 +01:00
Philipp Hagemeister
1a6373ef39
[sort_formats] Prefer bitrate over video size
...
720p @ 1000KB/s looks way better than 1080p @ 500KB/s
2015-02-03 10:53:07 +01:00
Philipp Hagemeister
f6c24009be
[YoutubeDL] Calculate thumbnail IDs automatically
2015-02-03 10:52:22 +01:00
Philipp Hagemeister
d862042301
[aftonbladet] Modernize
2015-02-03 10:18:32 +01:00
Philipp Hagemeister
23d9ded655
[franceculture] Rewrite for new HTML scheme ( Fixes #4853 )
2015-02-03 10:17:13 +01:00
Philipp Hagemeister
4c1a017e69
release 2015.02.03
2015-02-03 00:22:52 +01:00
Philipp Hagemeister
2cf0ecac7b
[ffmpeg] --add-metadata: Set comment and purl fields ( Fixes #4847 )
2015-02-03 00:16:45 +01:00
Philipp Hagemeister
d0eca21021
release 2015.02.02.5
2015-02-02 23:47:19 +01:00
Philipp Hagemeister
c1147c05e1
[brightcove] Fix up more generically invalid XML ( Fixes #4849 )
2015-02-02 23:47:14 +01:00
Philipp Hagemeister
55898ad2cf
release 2015.02.02.4
2015-02-02 23:39:03 +01:00
Philipp Hagemeister
a465808592
Merge branch 'master' of github.com:rg3/youtube-dl
2015-02-02 23:38:54 +01:00
Philipp Hagemeister
5c4862bad4
[normalboots] Remove unused import
2015-02-02 23:38:45 +01:00
Philipp Hagemeister
995029a142
[nerdist] Add new extractor ( Fixes #4851 )
2015-02-02 23:38:35 +01:00
Jaime Marquínez Ferrándiz
a57b562cff
[nfl] Add support for articles pages ( fixes #4848 )
2015-02-02 23:17:00 +01:00
Philipp Hagemeister
531572578e
[normalboots] Modernize
2015-02-02 23:04:39 +01:00
Philipp Hagemeister
3a4cca687f
release 2015.02.02.3
2015-02-02 22:56:15 +01:00
Philipp Hagemeister
7d3d06a16c
[vevo] Restore SMIL support ( #3656 )
2015-02-02 22:48:12 +01:00
Philipp Hagemeister
c21b1fbeeb
release 2015.02.02.2
2015-02-02 21:58:58 +01:00
Philipp Hagemeister
f920ce295e
[ntvru] Remove unused import
2015-02-02 21:58:17 +01:00
Philipp Hagemeister
7a7bd19c45
[n-tv.de] Use native m3u8 as best format
2015-02-02 21:57:48 +01:00
Philipp Hagemeister
8f4b58d70e
[ntvde] Add new extractor ( Fixes #4850 )
2015-02-02 21:48:54 +01:00
Philipp Hagemeister
3fd45e03bf
[ntvru] Rename from NTV to clarify the difference between n-tv.de and ntv.ru
2015-02-02 20:43:02 +01:00
Philipp Hagemeister
869b4aeff4
release 2015.02.02.1
2015-02-02 20:35:04 +01:00
Philipp Hagemeister
cc9ca3ba6e
[downloader/external] Simplify source_address
...
'' might actually be passed in, so check for None.
2015-02-02 20:33:25 +01:00
Philipp Hagemeister
ea71034bd3
Merge remote-tracking branch 'origin/master'
...
Conflicts:
youtube_dl/downloader/external.py
2015-02-02 20:32:07 +01:00
Philipp Hagemeister
9fffd0469f
[options] Mark --fixup as non-experimental and correct its help
2015-02-02 20:28:18 +01:00
Sergey M․
ae7773942e
[downloader/external] Simplify
2015-02-02 21:51:38 +06:00
Sergey M․
469a64cebf
[downloader/external] Simplify
2015-02-02 21:40:52 +06:00
Sergey M.
aae3fdcfae
Merge pull request #4845 from vijayanandnandam/master
...
Passing source address option to external downloaders
2015-02-02 21:38:22 +06:00
vijayanand nandam
6a66904f8e
passing source address option to external downloaders
2015-02-02 20:51:40 +05:30
Sergey M․
78271e3319
[drtv] Extract material id ( Closes #4814 )
2015-02-02 21:11:25 +06:00
Sergey M․
92bf0bcdf8
[historicfilms] Add extractor ( Closes #4825 )
2015-02-02 20:52:37 +06:00
Philipp Hagemeister
1283204917
[http] PEP8 ( #4831 )
2015-02-02 12:05:39 +01:00
Philipp Hagemeister
6789defea9
Merge pull request #4831 from light94/master
...
Handling Connection Reset by Peer Error
2015-02-02 12:03:28 +01:00
Philipp Hagemeister
acf2a6e97b
release 2015.02.02
2015-02-02 01:49:40 +01:00
Philipp Hagemeister
8cfb6efe6f
[jsinterp] Correct div command
2015-02-02 01:49:32 +01:00
Philipp Hagemeister
0a7055c90d
release 2015.02.01
2015-02-01 22:42:19 +01:00
Philipp Hagemeister
9e3f19919a
[jsinterp] Beef up and add tests
...
In preparation for #4822 , extend jsinterp by a lot. (We may even have to/want to write a proper interpreter with actual parsing)
2015-02-01 22:38:29 +01:00
Sergey M․
4a3da4ebdb
[hls] Simplify
2015-02-01 23:54:38 +06:00
Sergey M․
027008b14e
[hls] Fix encode issues on python2 @ Windows
2015-02-01 23:49:23 +06:00
Sergey M․
c6df692466
[rutv] Extract all m3u8 formats
2015-02-01 23:48:23 +06:00
Philipp Hagemeister
acf757f42e
[youtube] Complete test definition
2015-02-01 15:33:32 +01:00
Philipp Hagemeister
dd8982f19c
[wdr] Complete test definition
2015-02-01 15:27:16 +01:00
Philipp Hagemeister
654bd52f58
[teletask] Fix test definition
2015-02-01 15:25:33 +01:00
Philipp Hagemeister
a9551e9020
[soundcloud:set] Fix test definition
2015-02-01 15:24:38 +01:00
Philipp Hagemeister
c172440ac5
[ringtv] Modernize test definition
2015-02-01 15:21:02 +01:00
Philipp Hagemeister
e332772531
[servingsys] Modernize
2015-02-01 15:18:52 +01:00
Philipp Hagemeister
437cac8cc1
[sina] Modernize and simplify
2015-02-01 15:16:35 +01:00
Philipp Hagemeister
9f281cacd2
[keezmovies] Fix extraction and modernize test
2015-02-01 15:13:44 +01:00
Philipp Hagemeister
748a0fab8a
Remove unused imports
2015-02-01 15:08:50 +01:00
Philipp Hagemeister
c1f06d6307
[macgamestore] Modernize
2015-02-01 15:08:33 +01:00
Philipp Hagemeister
c4e817ce4a
[france2.fr:generation-quoi] Modernize
2015-02-01 15:06:55 +01:00
Philipp Hagemeister
9a3e5e6955
[kankan] Modernize
2015-02-01 15:03:55 +01:00
Philipp Hagemeister
228d30ed06
[la7] Modernize
2015-02-01 15:03:03 +01:00
Philipp Hagemeister
057c0609fc
[toutv] Modernize test definition
2015-02-01 15:01:33 +01:00
Philipp Hagemeister
17d2712d9c
[teamcoco] Modernize and fix extraction
2015-02-01 15:00:54 +01:00
Philipp Hagemeister
fc09240e24
[vimeo] Modernize test definition
2015-02-01 12:12:27 +01:00
Philipp Hagemeister
146303136f
[nerdcubed] Modernize test definition
2015-02-01 12:11:20 +01:00
Philipp Hagemeister
96aded8d3d
[rottentomatoes] Modernize test definition
2015-02-01 12:11:14 +01:00
Philipp Hagemeister
2886be15aa
[defense] Modernize
2015-02-01 12:10:15 +01:00
Philipp Hagemeister
ca0f500ecf
[mtv] Modernize and clean up test
2015-02-01 12:08:21 +01:00
Philipp Hagemeister
29aef5a33c
[ard] Remove deleted video test case
2015-02-01 12:00:47 +01:00
Philipp Hagemeister
9158b2b301
[mpora] Modernize
2015-02-01 11:58:37 +01:00
Philipp Hagemeister
0196149c5b
[compat] Correct compat_basestring definition
2015-02-01 11:37:00 +01:00
Philipp Hagemeister
8f9312c387
Appease pyflakes8-3
2015-02-01 11:30:56 +01:00
Sergey M․
8c72beb25e
[globo] Properly extract m3u8 formats ( #4346 #4832 )
2015-02-01 04:36:24 +06:00
kinetoskombi
1ee94db2d0
[globo] Fix error on some globo videos
2015-01-31 20:07:43 -02:00
light94
e77d2975af
Handling Connection Reset by Peer Error
2015-02-01 00:10:58 +05:30
Jaime Marquínez Ferrándiz
e41b1f7385
Fix flake8 errors
2015-01-31 10:51:39 +01:00
Jaime Marquínez Ferrándiz
cd596028d6
[rtve] Recognize mobile urls ( fixes #4823 )
2015-01-30 23:46:55 +01:00
Jaime Marquínez Ferrándiz
cc57bd33a8
[rtve] Fix extraction
...
Skip live stream test, we can't use the f4m manifest yet
2015-01-30 23:46:55 +01:00
Sergey M․
6d593c3276
[YoutubeDL] Fix video+audio format_id ( Closes #4824 )
2015-01-31 03:50:11 +06:00
Philipp Hagemeister
91755ee384
[comedycentral:shows] Generate better IDs and add a test for that
2015-01-30 19:43:46 +01:00
Sergey M․
0692ef86ef
[bbccouk] Improve _VALID_URL
2015-01-30 23:47:09 +06:00
Sergey M․
439d9be27d
[mixcloud] Remove unused import
2015-01-30 23:21:58 +06:00
Sergey M․
b80505a409
[mixcloud] Fix extraction ( Closes #4784 )
2015-01-30 23:21:44 +06:00
Sergey M․
e4c17d7274
[nhl:news] Add extractor ( Closes #4805 )
2015-01-30 23:12:27 +06:00
Sergey M․
2c58674e0e
[nhl] Improve _VALID_URL ( #4805 )
2015-01-30 22:46:53 +06:00
Sergey M․
ef1269fb07
[drtv] Improve _VALID_URL ( #4814 )
2015-01-30 22:42:11 +06:00
Sergey M․
e525d9a3df
[mtv] Extract subtitles ( Closes #4811 )
2015-01-30 21:57:59 +06:00
Sergey M․
20b4492c71
[spike] Improve _VALID_URL
2015-01-30 21:54:48 +06:00
Sergey M․
dee3f73787
[spike] Modernize
2015-01-30 21:54:14 +06:00
Philipp Hagemeister
d543bdc351
[downloader/f4m] Clarify that we should eventually just implement the DRM scheme ( #3000 )
2015-01-30 16:06:55 +01:00
Philipp Hagemeister
c7ff0c6422
Merge remote-tracking branch 'rzhxeo/f4m-drm'
2015-01-30 16:00:47 +01:00
Philipp Hagemeister
01c46659c4
[washingtonpost] Catch more UUIDs
2015-01-30 15:53:58 +01:00
Philipp Hagemeister
b04b885271
[extractor/common] Document all protocol values
2015-01-30 15:53:16 +01:00
Philipp Hagemeister
70fca8d694
[youtube] Remove unused import
2015-01-30 10:59:19 +01:00
Philipp Hagemeister
a52c633536
[cinchcast] Wrap overly long lines ( #4820 )
2015-01-30 10:59:07 +01:00
codesparkle
749f2ca044
Smotri info extractor: removed unreachable code and updated old md5 for test video
2015-01-30 20:35:20 +11:00
codesparkle
5468ff4d91
Remove duplicate dictionary keys
2015-01-30 20:11:51 +11:00
codesparkle
1d2daaea63
Simplify list creation
2015-01-30 20:10:12 +11:00
codesparkle
52585fd6dc
The opening curly brace {
is a regex reserved [control character]( http://stackoverflow.com/a/400316/1106367 ), so it needs to be escaped.
2015-01-30 18:41:40 +11:00
Philipp Hagemeister
c03844a4ec
release 2015.01.30.2
2015-01-30 04:44:00 +01:00
Philipp Hagemeister
6449cd807e
[youtube] Fall back to embed webpage when content is blocked on main ( Fixes #4717 )
2015-01-30 04:43:50 +01:00
Philipp Hagemeister
5d6677ca28
release 2015.01.30.1
2015-01-30 03:50:40 +01:00
Philipp Hagemeister
5a8a29cfea
release 2015.01.30
2015-01-30 03:46:57 +01:00
Philipp Hagemeister
c1708b89c0
[youtube:truncated_url] Add hl= forms ( #4799 )
2015-01-30 03:45:29 +01:00
Philipp Hagemeister
83fddfd493
[dctp] PEP8
2015-01-30 03:45:06 +01:00
Philipp Hagemeister
6ebb0dca9f
[dctp] Improve output ( #4796 )
2015-01-30 03:15:34 +01:00
Philipp Hagemeister
cf8d6ec865
Merge remote-tracking branch 'bastik/dev-dctp'
2015-01-30 03:12:53 +01:00
Philipp Hagemeister
3198291f26
[ctsnews] Remove unused import
2015-01-30 03:09:51 +01:00
Philipp Hagemeister
02c1d5e285
Merge remote-tracking branch 'yan12125/IE_NextMedia'
2015-01-30 03:09:19 +01:00
Philipp Hagemeister
ec4161a57d
[ctsnews] Remove news count check ( #4802 )
...
That's the number of articles (or at least some constant value); view count is the number of views of the video!
Also add a better description so that we can distinguish the two downloads.
2015-01-30 03:08:50 +01:00
Philipp Hagemeister
03d2d6d51b
Merge remote-tracking branch 'yan12125/IE_CtsNews'
2015-01-30 03:03:19 +01:00
Philipp Hagemeister
83fda3c000
Add a test for --no-check-certificate
2015-01-30 02:57:37 +01:00
Philipp Hagemeister
4fe8495a23
[viddler] PEP8
2015-01-30 02:13:37 +01:00
Philipp Hagemeister
a16f6643f0
Merge pull request #4815 from jaimeMF/https_handler
...
[utils] YoutubeDLHTTPSHandler.https_open: pass all required arguments to to do_open
2015-01-30 01:57:46 +01:00
Philipp Hagemeister
adc0ae3ceb
[__init__] Provide a better error messages if URLs are missing ( Closes #4813 )
2015-01-30 01:56:15 +01:00
Paul Hartmann
7bb3ceb4c7
[dctp] prefix real_time parameter with rtmp_
2015-01-30 00:47:43 +01:00
Paul Hartmann
75a4fc5b72
[dctp] fix test
2015-01-30 00:35:53 +01:00
Paul Hartmann
87673cd438
[dctp] follow id conventions
2015-01-29 23:34:56 +01:00
Paul Hartmann
f345fe9db7
[dctp] fix python 2.6 compatibility
2015-01-29 23:32:23 +01:00
Yen Chi Hsuan
e683a48d0e
[ctsnews] Detect youtube embedde videos
2015-01-30 05:50:47 +08:00
Jaime Marquínez Ferrándiz
a7a14d9586
[YoutubeDL] set the 'thumbnails' field if the info_dict has the 'thumbnails' field
...
Since the '--write-thumbnail' uses the 'thumbnails' field and we didn't updated the info_dict, it wouldn't detect the thumbnail. (fixes #4812 )
2015-01-29 20:15:38 +01:00
Sergey M․
219337990b
[xuite] Fix _VALID_URL
2015-01-29 23:11:13 +06:00
Sergey M.
376a770cc4
Merge pull request #4809 from bastik/fix-sr
...
fix srmediathek description
2015-01-29 22:14:15 +06:00
Sergey M․
affd04a45d
[xuite] Simplify and improve
2015-01-29 22:09:59 +06:00
Sergey M․
c84130e865
Merge branch 'IE_Xuite' of https://github.com/yan12125/youtube-dl into yan12125-IE_Xuite
2015-01-29 20:21:34 +06:00
Jaime Marquínez Ferrándiz
4f264c02c7
[utils] YoutubeDLHTTPSHandler.https_open: pass all required arguments to do_open
...
With this change the '--no-check-certificate' works again (#4807 ).
2015-01-29 15:01:27 +01:00
Paul Hartmann
d205476103
fix srmediathek description
2015-01-29 01:36:15 +01:00
Yen Chi Hsuan
367cc95aa7
[CtsNews] Add new extractor
2015-01-29 03:49:56 +08:00
Yen Chi Hsuan
206dba27a4
[NextMedia] Add new extractor
2015-01-29 03:18:53 +08:00
Sergey M․
dcf53d4408
[YoutubeDL] Set format_id for video+audio ( Closes #3634 )
2015-01-29 00:44:40 +06:00
Sergey M․
63be3b8989
[ivi] Modernize
2015-01-28 23:58:14 +06:00
Sergey M․
18b4e9e79d
[viddler] Extract comment count
2015-01-28 23:21:17 +06:00
Sergey M․
cb454b333d
[generic] Improve some regexes
2015-01-28 23:07:37 +06:00
Sergey M․
b04fbd789c
[viddler] Modernize
2015-01-28 22:49:42 +06:00
Paul Hartmann
48a1e5141a
added test for dctp
2015-01-28 08:59:58 +01:00
Paul Hartmann
0865f397ae
added extractor for dctp.tv
2015-01-28 08:21:04 +01:00
Shaya G
796df3c631
fixed viddler support - needed a Referer header; also added a viddler
...
generic extractor
2015-01-28 00:08:19 -05:00
Yen Chi Hsuan
a28383834b
[xuite] Update tests
2015-01-28 01:30:14 +08:00
Sergey M․
3a0d2f520a
[YoutubeDL] Temporary fix for subprocess encoding issues on python2 @ Windows ( Closes #4787 )
...
For now filenames will be encoded with preferrefencoding before written to disk
2015-01-27 22:38:28 +06:00
Yen Chi Hsuan
6348ad12a0
[xuite] Add height information for the two formats
2015-01-28 00:13:40 +08:00
Yen Chi Hsuan
fe7710cbcc
[xuite] Add new extractor
2015-01-27 23:55:22 +08:00
Naglis Jonaitis
2103d038b3
[lnkgo] Adapt to website changes
2015-01-27 15:38:54 +02:00
rzhxeo
6ca85be6f8
Filter DRM protected media in f4m downloader
2015-01-26 20:44:48 +01:00
Philipp Hagemeister
9f0df77ab1
[YoutubeDL] Allow format filtering by fps
2015-01-26 14:36:22 +01:00
Jaime Marquínez Ferrándiz
e72c7e4123
[YoutubeDL] Always set the '_filename' field in the info_dict (reported in #4053 )
...
It's also useful when you use the '--write-info-json' option.
2015-01-26 12:01:43 +01:00
Philipp Hagemeister
2b1bd292ae
release 2015.01.25
2015-01-25 21:40:43 +01:00
Philipp Hagemeister
71e7da6533
Merge branch 'master' of github.com:rg3/youtube-dl
2015-01-25 21:39:50 +01:00
Sergey M․
d862a4f94f
[spiegel] Use generalized formats pre-testing
2015-01-26 00:34:31 +06:00
Sergey M․
a57e8ce658
[lynda] Pre-test video URLs for HTTP errors ( Closes #2185 , closes #4782 )
2015-01-26 00:33:42 +06:00
Sergey M․
96a53167fa
[common] Generalize URLs' HTTP errors pre-testing
2015-01-26 00:32:31 +06:00
Jaime Marquínez Ferrándiz
6d2749aac4
[drtv] Prefer the version without spoken subtitles ( fixes #4779 )
...
For example for http://www.dr.dk/tv/se/moderne-klassikere/moderne-klassikere-one-republic-apologize#!/ , there's a version where everytime someone speaks in English a computer voice translates it.
2015-01-25 18:56:04 +01:00
Philipp Hagemeister
b1b0b1ca30
[generic] Improve description testcase in rss test
2015-01-25 18:14:59 +01:00
Philipp Hagemeister
3dee7826e7
[rtl2] PEP8, simplify, make rtmp tests run ( #470 )
2015-01-25 18:09:48 +01:00
Philipp Hagemeister
d4f64cabf4
Merge remote-tracking branch 'David-Development/rtl2.py'
2015-01-25 17:55:31 +01:00
David Development
fe41ddbb28
refactoring - bug fixes
2015-01-25 11:53:53 +01:00
Philipp Hagemeister
ee69b99af6
[YoutubeDL] clarify hook documentation
2015-01-25 06:15:54 +01:00
Philipp Hagemeister
767ff0a2d1
Merge branch 'travis-rtmp'
2015-01-25 05:30:47 +01:00
Philipp Hagemeister
8604e882a8
[ubu] Fix test and modernize
2015-01-25 05:23:21 +01:00
Philipp Hagemeister
cc1237f484
[__init__] Work around flake8 false positive
2015-01-25 05:17:43 +01:00
Philipp Hagemeister
37f4ce538a
[smotri] Fix test case
2015-01-25 05:17:15 +01:00
Philipp Hagemeister
7d346331b5
[audiomack:album] Update testcase
2015-01-25 05:15:47 +01:00
Philipp Hagemeister
e1ccc04e9f
Test rtmpdump on travis ( Fixes #1601 )
2015-01-25 04:56:32 +01:00
Philipp Hagemeister
881e6a1f5c
Add --xattr-set-filesize option ( Fixes #1348 )
2015-01-25 04:49:44 +01:00
Philipp Hagemeister
baeaeffce5
[options] Add support for infinite retries ( Fixes #507 )
2015-01-25 04:34:38 +01:00
Philipp Hagemeister
c14e88f0f5
[YoutubeDL] Add --playlist-items option ( Fixes #2662 )
2015-01-25 04:24:55 +01:00
Philipp Hagemeister
8940b8608e
Merge remote-tracking branch 'h-collector/master'
...
Conflicts:
youtube_dl/extractor/fc2.py
2015-01-25 03:48:26 +01:00
Philipp Hagemeister
ec82d85acd
[YoutubeDL] Implement --write-all-thumbnails ( Closes #2269 )
2015-01-25 03:11:12 +01:00
Philipp Hagemeister
cfb56d1af3
Add --list-thumbnails
2015-01-25 02:43:19 +01:00
Sergey M․
1e10802990
[krasview] Fix extraction
2015-01-25 05:21:39 +06:00
David-Development
7906d199a1
[rtl2] Add new extractor
2015-01-25 00:07:15 +01:00
Jaime Marquínez Ferrándiz
1070711d60
[YoutubeDL._calc_cookies] Restore the 'is_unverifiable'
...
I should have check everything was copied before commiting 4b405cfc6e
.
2015-01-24 20:12:47 +01:00
Jaime Marquínez Ferrándiz
4b405cfc6e
[YoutubeDL._calc_cookies] Restore the 'has_header' method
...
I didn't copied it from downloader/external
2015-01-24 20:08:24 +01:00
Jaime Marquínez Ferrándiz
e5660ee6ae
[YoutubeDL] Fill the info dict 'http_headers' field with all the headers available
...
Useful for external tools using the json output.
The methods '_calc_headers' and '_calc_cookies' have been copied from the downloader/external, now they just use "info_dict['http_headers']".
2015-01-24 18:56:04 +01:00
Jaime Marquínez Ferrándiz
587a9c2749
[downloader/external] Use the 'http_headers' field
2015-01-24 18:25:09 +01:00
Jaime Marquínez Ferrándiz
e1554a407d
[extractors] Use http_headers for setting the User-Agent and the Referer
2015-01-24 18:23:53 +01:00
Jaime Marquínez Ferrándiz
3fcfb8e9fa
[utils] YoutubeDLHandler: don't use 'Youtubedl-user-agent' for overriding the default user agent
...
Setting the 'User-Agent' header is enough
2015-01-24 18:07:21 +01:00
Philipp Hagemeister
384b62028a
[downloader/external] Add curl and aria2c ( Closes #182 )
2015-01-24 13:33:45 +01:00
Philipp Hagemeister
b95aab8482
[youtube:truncated_url] Add x-yt-cl URLs ( #4773 )
2015-01-24 11:42:39 +01:00
Sergey M․
fc2d6abfe7
[videott] Improve _VALID_URL and add test
2015-01-24 16:11:40 +06:00
Irfan Charania
6aa4f54d66
[videott] improve extraction
2015-01-23 17:41:07 -08:00
Philipp Hagemeister
222516d97d
[downloader] Lay groundwork for external downloaders.
...
This comes with a very simply implementation for wget; the real work is in setting up the infrastructure.
2015-01-24 01:38:48 +01:00
Philipp Hagemeister
a055469faf
[downloader] Improve downloader selection
2015-01-23 23:50:31 +01:00
Jaime Marquínez Ferrándiz
12d1fb5aa9
[twitch] PEP8
2015-01-23 21:05:07 +01:00
Jaime Marquínez Ferrándiz
48f00d15b1
[auengine] Remove extractor
...
The test is probably infringing copyright and nobody has provided a new test (see #4643 ).
2015-01-23 21:03:00 +01:00
Naglis Jonaitis
3e055aa5c3
[cliphunter] Fix extraction and update test ( Fixes #4362 )
2015-01-23 21:23:40 +02:00
Philipp Hagemeister
6896a52721
release 2015.01.23.4
2015-01-23 18:58:32 +01:00
Philipp Hagemeister
5779b3e1fe
Merge remote-tracking branch 'origin/master'
2015-01-23 18:58:28 +01:00
Philipp Hagemeister
62cd676c74
[youtube] Fixup DASH m4a headers
...
This fixes #2288 , #2506 , #2607 , #3681 , #4741 , #4767 .
2015-01-23 18:39:12 +01:00
Sergey M․
0c17278843
[atresplayer] Extract subtitles
2015-01-23 22:54:29 +06:00
Philipp Hagemeister
d229ee70da
Merge remote-tracking branch 'origin/master'
2015-01-23 17:22:45 +01:00
Philipp Hagemeister
26e274666d
[liveleak] Add original videos ( Fixes #4768 )
2015-01-23 17:22:14 +01:00
Sergey M․
ebd46aed51
[atresplayer] Filter URLs and clarify android format ids
2015-01-23 22:21:55 +06:00
Philipp Hagemeister
e793f7671c
[liveleak] Modernize
2015-01-23 17:09:26 +01:00
Sergey M․
c2e64f71d0
[twitch] Add support for bookmarks
2015-01-23 21:58:40 +06:00
Jaime Marquínez Ferrándiz
0920e5830f
[atresplayer] Don't include f4m formats if they are protected by DRM ( fixes #4705 )
2015-01-23 16:39:23 +01:00
Jaime Marquínez Ferrándiz
bf7fa94ec7
[downloader/f4m] build_fragments_list: Support videos with more than 1 segment
2015-01-23 16:31:52 +01:00
Philipp Hagemeister
6f58db8982
release 2015.01.23.3
2015-01-23 12:17:19 +01:00
Philipp Hagemeister
aa42e87340
[utils] Catch strange Windows errors ( Closes #4733 )
2015-01-23 12:17:12 +01:00
Philipp Hagemeister
649f7966f7
Fix --sleep-interval ( #3426 )
2015-01-23 12:07:13 +01:00
Philipp Hagemeister
5f0d813d93
Merge remote-tracking branch 'rupertbaxter2/master'
...
Conflicts:
youtube_dl/__init__.py
youtube_dl/downloader/common.py
2015-01-23 12:05:01 +01:00
Philipp Hagemeister
501f13fbf3
[generic] Add support for Cinerama player ( Fixes #4752 )
2015-01-23 12:00:25 +01:00
Philipp Hagemeister
ba55168157
release 2015.01.23.2
2015-01-23 11:20:24 +01:00
Philipp Hagemeister
d79323136f
[utils] Simplify HTTPS socket creation
...
We were duplicating (bad) code and doing crazy things with SSL.
Just use TLSv1 across the board, and do with one implementation of HTTPSConnection.connect.
Fixes #4696 .
2015-01-23 11:15:18 +01:00
Philipp Hagemeister
08ff6ab07e
[gamestar] Modernize slightly
2015-01-23 01:34:24 +01:00
Philipp Hagemeister
ba655a0e4c
Merge remote-tracking branch 'derrotebaron/master'
2015-01-23 01:32:52 +01:00
Philipp Hagemeister
b59c17e543
Merge pull request #4745 from BitLooter/master
...
Embed description and URL as MP4 tags
2015-01-23 01:22:19 +01:00
Philipp Hagemeister
61ca9a80b3
[generic] Add support for BOMs ( Fixes #4753 )
2015-01-23 01:21:30 +01:00
Philipp Hagemeister
317239b097
release 2015.01.23.1
2015-01-23 00:33:14 +01:00
Philipp Hagemeister
c2a30b250c
[testtube] Add new extractor ( Fixes #4759 )
2015-01-23 00:32:35 +01:00
Philipp Hagemeister
c994e6bd63
release 2015.01.23
2015-01-23 00:06:11 +01:00
Philipp Hagemeister
3ee2aa7a16
Merge remote-tracking branch 'origin/master'
2015-01-23 00:06:02 +01:00
Philipp Hagemeister
083c9df93b
[YoutubeDL] Allow filtering by properties ( Fixes #4584 )
2015-01-23 00:04:05 +01:00
Philipp Hagemeister
50789175ed
[pornhub] Detect private videos and emit an error message ( Closes #4764 )
2015-01-22 23:48:58 +01:00
Philipp Hagemeister
dc1b027cd4
[twitch] PEP8
2015-01-22 23:06:03 +01:00
Sergey M․
f353cbdb2f
[twitch:stream] Randomize query
2015-01-22 23:34:40 +06:00
Philipp Hagemeister
73e449b226
Merge branch 'master' of github.com:rg3/youtube-dl
2015-01-22 18:21:27 +01:00
Philipp Hagemeister
78111136db
[twitch] Move URL matching tests into extractor
2015-01-22 18:18:21 +01:00
Philipp Hagemeister
650ab5beeb
[comedycentral:shows] Remove references to colbert report
2015-01-22 18:15:58 +01:00
Philipp Hagemeister
7932de6352
[hearthisat] Correct error message
2015-01-22 18:15:04 +01:00
Sergey M․
240b9b7a5c
[twitch] Add support for streams ( Closes #893 , closes #3693 , closes #1884 )
2015-01-22 23:11:22 +06:00
Naglis Jonaitis
bb6e38787d
[videomega] Fix extraction ( Closes #4763 )
2015-01-22 18:36:49 +02:00
Philipp Hagemeister
898c23c03f
release 2015.01.22
2015-01-22 12:04:26 +01:00
Philipp Hagemeister
b55ee18ff3
[hearthisat] Add support for more high-quality download links
2015-01-22 12:04:13 +01:00
Naglis Jonaitis
e5763a7a7e
[hearthisat] Add new extractor ( Closes #4743 )
2015-01-21 21:47:55 +02:00
Sergey M․
8bb1bdfae9
[twitch:past_broadcasts] Fix IE_NAME
2015-01-21 23:06:16 +06:00
Sergey M․
bb0aa4cb3c
[streetvoice] Improve
2015-01-21 22:53:51 +06:00
Sergey M.
d63528c8c7
Merge pull request #4758 from yan12125/IE_streetvoice
...
[StreetVoice] Add new extractor
2015-01-21 22:36:50 +06:00
Sergey M․
c5db6bb32b
[twitch] Refactor and add support for past broadcasts
2015-01-21 22:27:21 +06:00
Yen Chi Hsuan
c8dc41a6e7
[StreetVoice] Add new extractor
2015-01-21 23:05:47 +08:00
Jaime Marquínez Ferrándiz
47e0e1e0e2
[nbc] Fix pep8 issue
2015-01-21 10:36:15 +01:00
Jaime Marquínez Ferrándiz
efcddaebe9
[cnn] Use edition.cnn.com for getting the information ( fixes #4757 )
...
Some videos (like http://edition.cnn.com/videos/us/2015/01/20/orig-yellowstone-oil-spill.cnn ) will fail if we use cnn.com.
2015-01-21 10:31:57 +01:00
Jaime Marquínez Ferrándiz
5fe5112589
[CNNArticle] Update test
2015-01-21 10:27:18 +01:00
Sergey M․
564bb5e964
[tinypic] Tweak VALID_URL regex ( Closes #4754 )
2015-01-21 02:15:28 +06:00
Sergey M․
2df54b4ba8
[nbcnews] Ignore HTTP errors while coping with playlists ( Closes #4749 )
2015-01-20 21:23:51 +06:00
Sergey M․
030aa5d9e7
[tvp] Fix extraction
2015-01-19 23:00:22 +06:00
Philipp Hagemeister
c511f13f22
[ndtv] Modernize
2015-01-19 10:10:05 +01:00
David Powell
bd3cbe0716
Embed description and URL as MP4 tags
2015-01-18 15:01:05 -08:00
Sergey M․
fdb2ed7455
[abc7news] Add extractor ( Closes #4734 )
2015-01-18 08:09:18 +06:00
Philipp Hagemeister
ba319696a9
[options] Clarify that --password can be left out ( #4723 )
2015-01-17 23:56:34 +01:00
Philipp Hagemeister
910c552052
release 2015.01.16
2015-01-16 14:20:38 +01:00
Philipp Hagemeister
cce81f192c
[bandcamp:album] Fix title extraction ( Fixes #4721 )
2015-01-16 14:20:25 +01:00
Philipp Hagemeister
9d22a7dfb0
[fourtube] Fix extraction
2015-01-16 13:44:44 +01:00
Philipp Hagemeister
4f4f642822
[npo] Remove unused import
2015-01-16 13:44:36 +01:00
Jaime Marquínez Ferrándiz
2875cf01bb
FFmpegEmbedSubtitlePP: simplify command
2015-01-16 13:37:37 +01:00
Jaime Marquínez Ferrándiz
e205db3bcd
FFmpegEmbedSubtitlePP: don't fail if the video doesn't have an audio stream ( fixes #4718 )
...
Instead of specifying which streams ffmpeg must copy, we tell it to copy all.
2015-01-16 13:29:01 +01:00
Philipp Hagemeister
31d4a6e212
release 2015.01.15.1
2015-01-15 22:38:11 +01:00
Sergey M․
aaeb86f682
[youtube] Add test for #4706
2015-01-16 01:25:03 +06:00
Phil Kulak
a9b6b5cd15
Looks like Google switched to a new JS compiler that includes dollar signs in function names.
2015-01-15 10:23:05 -08:00
Naglis Jonaitis
a45c0a5d67
[videomega] Fix extraction ( Closes #4703 )
2015-01-15 19:57:36 +02:00
Sergey M․
c8dfe360eb
[atresplayer] Add authentication support ( Closes #4700 )
2015-01-15 21:43:35 +06:00
Philipp Hagemeister
4cfaf85c65
release 2015.01.15
2015-01-15 12:42:11 +01:00
Philipp Hagemeister
be5f2c192c
[ssl] Correct connect creation
...
We want to authenticate the server, see https://docs.python.org/dev/library/ssl.html#ssl.Purpose.SERVER_AUTH .
2015-01-15 02:06:50 +01:00
Sergey M․
c9ef44ce29
[smotri] Improve extraction ( Closes #4698 )
2015-01-14 21:50:36 +06:00
Sergey M․
e92d4a11f5
[spiegel] Test format video URLs for 404 ( Closes #4579 )
2015-01-14 20:27:14 +06:00
Naglis Jonaitis
f2cbc96c3e
[lnkgo] Make more robust
2015-01-14 00:51:48 +02:00
Naglis Jonaitis
a69801e2c6
[utils] Add additional format to unified_strdate
2015-01-14 00:16:34 +02:00
Naglis Jonaitis
034206cec1
[lnkgo] Add new extractor
2015-01-14 00:14:59 +02:00
Sergey M․
04e0bac233
[npo:live] Add extractor ( Closes #4691 )
2015-01-13 20:54:03 +06:00
Johannes Knoedtel
3d5f7a3947
[utils] Prevent override of custom headers.
...
The dict of headers of request objects in urllib has its keys always
capitalized.
This causes the lookup to fail and overwrite the header. If for example
a Extractor tries to add a "User-Agent" header the internal
representation in the request object is "User-agent". The header is
therefore clobbered by the "User-Agent" in std_headers, because the
strings are not equal.
2015-01-12 22:38:51 +01:00
Sergey M․
227d4822ff
[utils] Disallow non string types in parse_duration ( Closes #4679 )
2015-01-12 21:06:26 +06:00
Philipp Hagemeister
5c4a81d934
[npo] Remove unused import
2015-01-11 23:43:09 +01:00
Philipp Hagemeister
8e2ec95575
[drbonanza] Simplify and fix duration ( #4687 )
2015-01-11 23:41:55 +01:00
Johan K. Jensen
8e7a9016d5
[DRBonanza] Add new extractor (fixing #4581 )
2015-01-11 23:23:10 +01:00
Sergey M․
c85f368370
[npo] Make extension check less strict and add test ( #4680 )
2015-01-11 23:45:52 +06:00
Sergey M․
a0977064ce
[npo] Fix non asf streams ( Closes #4680 )
2015-01-11 23:18:45 +06:00
Philipp Hagemeister
15aecd8711
release 2015.01.11
2015-01-11 17:47:04 +01:00
Philipp Hagemeister
20dd0b2d20
Merge branch 'master' of github.com:rg3/youtube-dl
2015-01-11 17:46:22 +01:00
Philipp Hagemeister
2aeb06d6dc
[utils] Improve colon handling ( Fixes #4683 )
2015-01-11 17:40:45 +01:00
Johan
6ccbb335d2
[drtv] Updated with support for https
2015-01-11 17:39:16 +01:00
Pierre
4340decad2
check for overwriting files in the downloader ( fixes #3916 , closes #3829 )
2015-01-11 12:02:27 +01:00
Jaime Marquínez Ferrándiz
f3ff1a3696
YoutubeDL: Make the decision about removing the original file after each postprocessor is run ( fixes #2261 )
...
If one of the processors said the file should be kept, it wouldn't pay
attention to the response from the following processors. This was wrong if the
'keep_video' option was False, if the first extractor modifies the original file
and then we extract its audio we don't want to keep the original video file.
2015-01-11 11:35:18 +01:00
Sergey M․
aa24de39aa
[veehd] Update test
2015-01-11 16:20:39 +06:00
Sergey M․
a798e64c15
[veehd] Improve extraction
2015-01-11 16:20:16 +06:00
Philipp Hagemeister
6a5fa75490
[karaoketv] Remove unused import
2015-01-11 10:48:20 +01:00
Philipp Hagemeister
8ad6b5ed9f
[compat] Correct socket error class reference
2015-01-11 10:47:39 +01:00
Sergey M․
d5bb814d34
[veehd] Capture removed video message
2015-01-11 15:42:53 +06:00
Sergey M․
d156a1d981
[xboxclips] Fix extraction
2015-01-11 15:25:29 +06:00
Sergey M․
987493aef3
[test_compat] Fix alphabetic order to make test_all_present pass
2015-01-11 15:13:03 +06:00
Philipp Hagemeister
8bfa75451b
[options] Add --no-call-home
...
While we're at it, also drop "experimental" moniker for --call-home - should work fine.
2015-01-10 21:09:18 +01:00
Philipp Hagemeister
cd3063f3fa
release 2015.01.10.2
2015-01-10 21:03:00 +01:00
Philipp Hagemeister
58b1f00d19
[YoutubeDL] Add new --call-home option for debugging
2015-01-10 21:02:27 +01:00
Philipp Hagemeister
149f05c7b6
release 2015.01.10.1
2015-01-10 20:06:13 +01:00
Philipp Hagemeister
8a1b9b068e
Merge remote-tracking branch 'origin/master'
2015-01-10 20:06:01 +01:00
Philipp Hagemeister
c5a59d9391
[utils] Fix call to _create_http_connection
...
Avoid confusion over args/kwargs.
2015-01-10 20:05:30 +01:00
Philipp Hagemeister
500b8b41c1
[options] Add -4 and -6 options
...
Fixes #520 , fixes #3626 .
2015-01-10 20:02:02 +01:00
Philipp Hagemeister
be4a824d74
Add new option --source-address
...
Closes #3618 , fixes #721 , fixes #2481 , fixes #4551 , closes #1020 .
2015-01-10 19:56:51 +01:00
Sergey M․
ed3958d714
[collegerama] Add extractor ( #4540 )
2015-01-11 00:40:46 +06:00
Philipp Hagemeister
c80ede5f13
[karaoketv] Simplify ( #3853 )
2015-01-10 18:03:36 +01:00
Philipp Hagemeister
bc694039e4
Merge remote-tracking branch 'lenaten/karaoketv'
2015-01-10 17:59:35 +01:00