etc/yt-dlp
0
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-24 02:35:12 +00:00
Code Issues Projects Releases Wiki Activity
6549 commits 3 branches 100 tags 84 MiB
Commit graph

5281 commits

Author SHA1 Message Date
Philipp Hagemeister
4d2d638df4 [http] Modernize 2014-11-26 12:27:36 +01:00
Philipp Hagemeister
0e44f90e18 [hls] Remove useless u porefixes 2014-11-26 12:26:21 +01:00
Philipp Hagemeister
15938ab67a [update] Modernize 2014-11-26 12:24:57 +01:00
Philipp Hagemeister
ab4ee31eb1 [utils] remove useless u prefix 2014-11-26 11:50:22 +01:00
Philipp Hagemeister
b061ea6e9f [compat] Beautify assertion 2014-11-26 11:48:09 +01:00
Philipp Hagemeister
4aae94f9d0 [YoutubeDL] Remove incorrect documentation 2014-11-26 11:25:43 +01:00
Philipp Hagemeister
acda92f6bc Clarify --no-playlist documentation (Closes #4309) 2014-11-26 10:51:03 +01:00
Philipp Hagemeister
ddfd0f2727 release 2014.11.26 2014-11-26 10:46:12 +01:00
Philipp Hagemeister
d0720e7118 Merge branch 'master' of github.com:rg3/youtube-dl 2014-11-26 10:45:57 +01:00
Philipp Hagemeister
4e262a8838 [generic] Detect direct video links (Fixes #4149, #4313) 2014-11-26 10:44:39 +01:00
Sergey M․
b9ed3af343 [tass] Add extractor (Closes #4296) 2014-11-25 22:24:33 +06:00
Philipp Hagemeister
63c9b2c1d9 release 2014.11.25.1 2014-11-25 14:34:29 +01:00
Philipp Hagemeister
65f3a228b1 [generic] Add support for LazyYT embeds (Fixes #4306) 2014-11-25 14:34:19 +01:00
Philipp Hagemeister
d9836a5917 release 2014.11.25 2014-11-25 09:56:52 +01:00
Philipp Hagemeister
be64b5b098 [xminus] Simplify and extend (#4302) 2014-11-25 09:54:54 +01:00
Philipp Hagemeister
0bbf12239c Merge remote-tracking branch 't0mm0/x-minus' 2014-11-25 09:22:33 +01:00
Philipp Hagemeister
c553fe5d29 [tmz] Simplify (#4304) 2014-11-25 09:16:40 +01:00
Matthew Rayfield
f0c3d729d7 [tmz] Add new extractor 2014-11-25 02:54:13 -05:00
t0mm0
1cdedfee10 [XMinus] Added new extractor. 2014-11-25 03:25:28 +00:00
Philipp Hagemeister
93129d9442 release 2014.11.24 2014-11-24 22:56:43 +01:00
Philipp Hagemeister
e8c8653e9d Merge remote-tracking branch 'origin/master' 2014-11-24 22:52:04 +01:00
Philipp Hagemeister
3d960a22fa [bpb] Simplify (#4298) 2014-11-24 22:47:23 +01:00
Philipp Hagemeister
51bbb084d3 Merge remote-tracking branch 'ossi96/bpb' 2014-11-24 22:42:56 +01:00
Naglis Jonaitis
2c25a2bd29 [tunein] Add new extractor (Closes #4097) 2014-11-24 23:15:33 +02:00
Oskar Jauch
355682be01 bpb Add new extractor 2014-11-24 20:02:00 +01:00
Jaime Marquínez Ferrándiz
00e9d396ab [francetv] Use the m3u8 manifest for georestricted videos (closes #3963) 
Generating the correct urls for the f4m segments seems to require a lot of work.
Also raise an error if the video is not available from your location.
 2014-11-24 19:49:43 +01:00
Philipp Hagemeister
14d4e90eb1 [downloader/__init__] Define proper __all__ 2014-11-23 22:25:12 +01:00
Philipp Hagemeister
b74e86f48a Fix all PEP8 issues except E501 2014-11-23 22:21:46 +01:00
Philipp Hagemeister
3d36cea4ac [vk] PEP8 2014-11-23 22:14:27 +01:00
Philipp Hagemeister
b66e699877 [myspace] pep8 and modernization 2014-11-23 22:12:18 +01:00
Philipp Hagemeister
27f8b0994e Merge remote-tracking branch 'jtwaleson/master' 2014-11-23 22:10:26 +01:00
Philipp Hagemeister
4ffc31033e [zingmp3] Simplify and PEP8 (#4288) 2014-11-23 22:00:25 +01:00
Philipp Hagemeister
c1777d5cb3 Merge remote-tracking branch 'daohoangson/zing-mp3' 2014-11-23 21:55:51 +01:00
Jouke Waleson
9e1a5b8455 PEP8: applied even more rules 2014-11-23 21:39:15 +01:00
Philipp Hagemeister
784b6d3a9b Merge remote-tracking branch 'jtwaleson/master' 2014-11-23 21:33:31 +01:00
Dao Hoang Son
c66bdc4869 [zingmp3] Added support for songs and albums 2014-11-24 03:25:47 +07:00
Jouke Waleson
2514d2635e PEP8: E225,E227 2014-11-23 21:23:05 +01:00
Jouke Waleson
8bcc875676 PEP8: more applied 2014-11-23 21:20:46 +01:00
Jouke Waleson
5f6a1245ff PEP8 applied 2014-11-23 20:41:03 +01:00
Philipp Hagemeister
f3a3407226 [youtube] Clarify keywords 2014-11-23 20:09:10 +01:00
Sergey M․
598c218f7b [smotri] Adapt to new API and modernize 2014-11-23 23:53:41 +06:00
Naglis Jonaitis
4698b14b76 [rtlxl] Strip additional dot from video URL (#4115) 2014-11-23 13:28:09 +02:00
Philipp Hagemeister
835a22ef3f release 2014.11.23.1 2014-11-23 10:51:16 +01:00
Philipp Hagemeister
7d4111ed14 Provide guidance when called with a YouTube ID starting with a dash. 
Reported at https://news.ycombinator.com/item?id=8648121
 2014-11-23 10:51:09 +01:00
Philipp Hagemeister
d16abf434a [vk] Some PEP8 love 2014-11-23 10:11:52 +01:00
Philipp Hagemeister
a8363f3ab7 [vk] Clarify test 2014-11-23 10:11:04 +01:00
Philipp Hagemeister
010cd3a3ee Merge remote-tracking branch 'WillSewell/vk-playlists' 2014-11-23 10:09:45 +01:00
Philipp Hagemeister
b9042def9d release 2014.11.23 2014-11-23 09:59:42 +01:00
Philipp Hagemeister
aa79ac0c82 [youtube] Support controversy videos (Fixes #4275) 2014-11-23 09:59:02 +01:00
Philipp Hagemeister
dd60be2bf9 [telebruxelles] Simplify (#4270) 2014-11-23 09:44:42 +01:00
Philipp Hagemeister
119b3caa46 Merge remote-tracking branch 'nulloz/telebruxelles' 2014-11-23 09:38:18 +01:00
Naglis Jonaitis
49f0da7ae1 [rtlxl] Use unencrypted m3u8 streams (#4115) 2014-11-22 21:06:45 +02:00
nulloz
2cead7e7bc telebruxelles Add new extractor 2014-11-22 13:34:29 +01:00
Will Sewell
9262867e86 [vk.com] Added newline at the end of the file. 2014-11-21 23:25:05 +00:00
Will Sewell
b9272e8f8f [vk.com] Removed redundant log message -- this information is already being logged. 2014-11-21 23:22:52 +00:00
Will Sewell
021a0db8f7 [vk.com] Simplified the page_id acquisition by using the id matched in the URL earlier on. 2014-11-21 23:22:44 +00:00
Will Sewell
e1e8b6897b [vk.com] Updated the extract_videos_from_page function with a much simpler 1-liner. 2014-11-21 23:16:12 +00:00
Will Sewell
53d1cd1f77 [vk.com] Updated the _VALID_URL regex for the playlist IE. Removed optional m, and named the id group. 2014-11-21 23:03:31 +00:00
Will Sewell
cad985ab4d [vk.com] Updated the description to include vk.com. 2014-11-21 23:00:43 +00:00
Will Sewell
c52331f30c [vk.com] Updated a test video that has been removed, and added a comment for others to update two other test videos that are also now removed. 2014-11-21 23:00:33 +00:00
Will Sewell
42e1ff8665 [vk.com] Added upload_date variable to the test cases that still work. 2014-11-21 23:00:17 +00:00
Philipp Hagemeister
2c64b8ba63 release 2014.11.21.1 2014-11-21 22:47:23 +01:00
Philipp Hagemeister
42e12102a9 [YoutubeDL] Fix multi_video check 2014-11-21 22:39:57 +01:00
Philipp Hagemeister
6127693ed9 [folketinget] Add extractor (Fixes #4262) 2014-11-21 22:36:24 +01:00
Philipp Hagemeister
71069d2157 [sztv] Remove useless determine_ext call 2014-11-21 22:03:29 +01:00
Philipp Hagemeister
f3391db889 [sztvhu] Modernize 2014-11-21 22:02:16 +01:00
Philipp Hagemeister
9b32eca3ce [generic] Add support for single quotes in HTML5 videos (Fixes #4265) 2014-11-21 22:01:25 +01:00
Philipp Hagemeister
ec06f0f610 release 2014.11.21 2014-11-21 10:41:18 +01:00
tinybug
85b9275517 Update jsinterp.py 
http://s.ytimg.com/yts/jsbin/html5player-zh_HK-vfl1NK6PR/html5player.js 
fix raise ExtractorError
 2014-11-21 17:09:22 +08:00
Philipp Hagemeister
dfd5313afd [YoutubeDL] Support new _type multi_video 2014-11-21 00:25:46 +01:00
Philipp Hagemeister
be53e2a737 [blip.tv:user] Modernize and add a test 2014-11-21 00:25:13 +01:00
Philipp Hagemeister
a1c68b9ef2 Merge remote-tracking branch 'origin/master' 2014-11-21 00:17:58 +01:00
Jaime Marquínez Ferrándiz
4d46c1c68c [brightcove] Improve error message detection (#4256) 2014-11-20 18:44:54 +01:00
Jaime Marquínez Ferrándiz
d6f714f321 [brightcove] Remove the namespace from the BrightcoveExperience html object 2014-11-20 18:37:08 +01:00
Philipp Hagemeister
8569f3d629 [vh1] Modernize 2014-11-20 16:51:33 +01:00
Philipp Hagemeister
fed5d03260 [extractor/common] Document _type values (Motivated by #4254) 2014-11-20 16:47:59 +01:00
Philipp Hagemeister
6adeffa7c6 [comedycentral] Modernize 2014-11-20 16:36:53 +01:00
Philipp Hagemeister
b244b5c3f9 remove unused imports 2014-11-20 16:36:13 +01:00
Philipp Hagemeister
f42c190769 [stanfordoc] Modernize 2014-11-20 16:34:54 +01:00
Philipp Hagemeister
c9bf41145f [YoutubeDL] Warn if an extractor returns compat_list 2014-11-20 16:29:31 +01:00
Philipp Hagemeister
5239075bb6 [mtv] Return a proper playlist result (#4254) 2014-11-20 16:25:19 +01:00
Philipp Hagemeister
84437adfa3 release 2014.11.20.1 2014-11-20 12:20:57 +01:00
Philipp Hagemeister
732ea2f09b [utils] Improve update on error message somewhat 
We still may want to implement a bulletproof check for the current version, and a better place to add this message so that it works for all kind of other errors too.
 2014-11-20 12:14:30 +01:00
Philipp Hagemeister
aff2f4f4f5 [arte] Clean up format sorting mess 
We now use our standard sorting facilities. As a side effect, it's finally possible to download German videos from French URLs and vice versa.
 2014-11-20 12:06:35 +01:00
Philipp Hagemeister
3b9f631c41 release 2014.11.20 2014-11-20 08:55:56 +01:00
Ivan Kozik
1394646a0a Fix "ERROR: Cannot write metadata to JSON file" on Windows 
Fixes #4246
 2014-11-20 06:26:34 +00:00
Ivan Kozik
61ee5aeb73 Fix UnicodeEncodeError with --write-info-json on Python 2.7 + Windows 
Fixes #4244
 2014-11-20 06:26:34 +00:00
Philipp Hagemeister
07e378fa18 [compat] correct OptionGroup invocation for Python 3 (fixes #4243) 2014-11-20 07:21:12 +01:00
Philipp Hagemeister
e07e931375 Work around 2.7.0 deficencies (Fixes #4223) 2014-11-19 18:21:58 +01:00
Naglis Jonaitis
480b7c32a9 [rtlxl] Fix format order 2014-11-19 01:21:02 +02:00
Jaime Marquínez Ferrándiz
92120217eb [cache] Fix writing to paths with unicode characters 
* Use "compat_getenv"
* "write_json_file" now expects the filename to be a string
 2014-11-19 00:02:24 +01:00
Naglis Jonaitis
37eddd3143 [rtlxl] Use m3u8 streams instead of f4m (#4115, #4118) 2014-11-19 00:26:44 +02:00
Will Sewell
02a12f9fe6 [vk] date_added is now extracted from the video page. 2014-11-18 20:19:56 +00:00
Will Sewell
6fcd6e0e21 [vk] Updated the regex for matching user video pages. It now matches optional URL parameters too. 2014-11-18 19:34:12 +00:00
Philipp Hagemeister
0857baade3 [youtube] Add webm audio formats (Fixes #4229) 2014-11-18 11:08:37 +01:00
Will Sewell
469d4c8968 [vk] Added a new information extractor for pages that are a list of a user\'s videos on vk.com. It works in a same way to playlist style pages for the YT information extractors. 2014-11-17 17:53:34 -05:00
Philipp Hagemeister
23ad44b57b [youtube] Better error message for DASH manifest 2014-11-17 20:12:52 +01:00
Philipp Hagemeister
f48d3e9bbc [swfinterp] Improve undefined representation 2014-11-17 08:02:48 +01:00
Philipp Hagemeister
fbf94a7815 [swfinterp] Add more builtins and improve static variables 2014-11-17 07:54:06 +01:00
Philipp Hagemeister
1921b24551 [swfinterp] Add support for more complicated constants 2014-11-17 07:31:22 +01:00
Philipp Hagemeister
28e614de5c [utils] Remove stray u' 2014-11-17 07:16:12 +01:00
Philipp Hagemeister
cd9ad1d7e8 [swfinterp] Basic support for constants (only ints for now) 2014-11-17 07:14:02 +01:00
Philipp Hagemeister
162f54eca6 [swfinterp] Implement bitand and pushshort operators 2014-11-17 05:08:39 +01:00
Philipp Hagemeister
33a266f4ba [swfinterp] Implement charCodeAt 2014-11-17 05:03:46 +01:00
Philipp Hagemeister
6b592d93a2 [swfinterp] Formalize built-in classes 2014-11-17 04:54:54 +01:00
Philipp Hagemeister
4686ae4b64 [swfinterp] Implement various opcodes 2014-11-17 04:45:12 +01:00
Philipp Hagemeister
8d05f2c16a [swfinterp] Add support for void methods 2014-11-17 04:36:23 +01:00
Philipp Hagemeister
a4bb83956c [swfinterp] Implement pushtrue and pushfalse opcodes 2014-11-17 04:29:34 +01:00
Philipp Hagemeister
eb5376044c [swfinterp] Implement equals opcode 2014-11-17 04:27:51 +01:00
Philipp Hagemeister
3cbcff8a2d [swfinterp] Implement String basics 2014-11-17 04:25:10 +01:00
Philipp Hagemeister
e983cf5277 [swfinterp] Interpret yet more opcodes 2014-11-17 04:00:41 +01:00
Philipp Hagemeister
0ab1ca5501 [swfinterp] Better error message 2014-11-17 03:53:32 +01:00
Philipp Hagemeister
4baafa229d [swfinterp] Intepret more multinames 2014-11-17 03:46:23 +01:00
Philipp Hagemeister
b7558d9881 [swfinterp] Allow function patching 2014-11-17 01:27:15 +01:00
Philipp Hagemeister
a4bc433619 [__init__] Modernize 2014-11-16 15:08:34 +01:00
Philipp Hagemeister
b6b70730bf [downloader/common] Modernize 2014-11-16 15:06:59 +01:00
Philipp Hagemeister
6a68bb574a [eporner] Fix duration (Closes #4188) 2014-11-16 14:55:22 +01:00
Philipp Hagemeister
0cf166ad4f release 2014.11.16 2014-11-16 00:51:46 +01:00
Philipp Hagemeister
2707b50ffe [spiegel] Correct handling of redirects to spiegel.tv (Closes #4211) 2014-11-16 00:51:31 +01:00
Philipp Hagemeister
939fe70de0 [spiegeltv] Match hash-style URLs (Closes #4210) 2014-11-16 00:40:09 +01:00
Philipp Hagemeister
89c15fe0b3 [spiegeltv] Modernize 2014-11-16 00:33:51 +01:00
Jaime Marquínez Ferrándiz
ec5f601670 [utils] Fix "write_json_file" for unicode names in python 2.x (fixes #4125) 2014-11-15 22:00:32 +01:00
Naglis Jonaitis
8caa0c9779 [bliptv] Fix the resolve of lookup ID (Closes #4197) 2014-11-15 16:56:04 +02:00
Philipp Hagemeister
e2548b5b25 release 2014.11.15.1 2014-11-15 15:21:50 +01:00
Philipp Hagemeister
bbefcf04bf [goldenmoustache] Fix title (Closes #4203) 2014-11-15 15:21:34 +01:00
Philipp Hagemeister
c7b0add86f [compat] Work around kwargs bugs in old 2.6 Python releases (Fixes #3813) 2014-11-15 15:17:19 +01:00
Philipp Hagemeister
a0155d93d9 release 2014.11.15 2014-11-15 11:01:54 +01:00
Philipp Hagemeister
00d9ef0b70 [mailru] Adapt to new data format (Fixes #4201) 2014-11-15 11:01:17 +01:00
Philipp Hagemeister
0cc8888038 [crunchyroll] Remove NOP code (#2782) 2014-11-15 00:34:03 +01:00
Philipp Hagemeister
c735450e07 release 2014.11.14 2014-11-14 22:27:56 +01:00
Jaime Marquínez Ferrándiz
71f8c7ce7a [mtvservices:embedded] Improve config url (fixes #4092) 2014-11-14 19:02:18 +01:00
Jaime Marquínez Ferrándiz
5fee0eeac0 [ComedyCentralShows] Use the rtmp urls transform function from the MTV IE (fixes #3364) 
It produces the right mp4 urls, so we stop prefering the rtmp urls.
 2014-11-14 18:36:04 +01:00
Philipp Hagemeister
eb4157fd17 [utils] Fix struct.pack call on very old Python versions (#4181) 2014-11-14 00:39:32 +01:00
Philipp Hagemeister
69ede8ef81 release 2014.11.13.3 2014-11-13 16:28:24 +01:00
Philipp Hagemeister
609a61e3e6 [npo] Improve npo.nl (Fixes #4173) 2014-11-13 16:28:05 +01:00
Philipp Hagemeister
bf951c5e29 release 2014.11.13.2 2014-11-13 16:12:54 +01:00
Philipp Hagemeister
af63fed7d8 [generic] Add support for livestream embeds (Fixes #4185) 2014-11-13 16:12:51 +01:00
Philipp Hagemeister
3deed1e91a [freevideo] Simplify and raise error for foreigners (Fixes #4131) 2014-11-13 15:59:22 +01:00
Philipp Hagemeister
11b28e93d3 Merge remote-tracking branch 'yaccz/add-extractor/freevideo' 2014-11-13 15:53:16 +01:00
Philipp Hagemeister
c3d582985f release 2014.11.13.1 2014-11-13 15:42:48 +01:00
Philipp Hagemeister
4c0924bb24 [utils] Fix intlist_to_bytes in Python 2 (#4181) 2014-11-13 15:28:42 +01:00
Philipp Hagemeister
3fa5bb3802 [sexu] Modernize (#4171) 2014-11-13 15:20:49 +01:00
Philipp Hagemeister
c47ec62b83 Merge remote-tracking branch 'peugeot/sexu' 2014-11-13 15:18:38 +01:00
Philipp Hagemeister
e4bdb37ec6 [spiegel] Add support for embeds 2014-11-13 15:02:31 +01:00
Philipp Hagemeister
0e15e725a0 [spiegel] Modernize 2014-11-13 14:45:17 +01:00
peugeot
437f68d868 Update sexu.py 2014-11-13 14:02:53 +01:00
peugeot
d91d124081 fix python 2 test 2014-11-13 13:57:10 +01:00
Philipp Hagemeister
2d42905b68 release 2014.11.13 2014-11-13 09:57:58 +01:00
Aaron Wojnowski
894dd8682e Fix YouTube signature extraction. 2014-11-13 00:33:27 -06:00
Jaime Marquínez Ferrándiz
9e05d039e0 [dailymotion] Fix extraction of vevo videos (fixes #4168) 2014-11-12 23:32:27 +01:00
peugeot
bbd5f2de5e [sexu] initial support 2014-11-12 20:41:13 +01:00
Naglis Jonaitis
73689dafbf [tvplay] Fix f4m URL extraction (Closes #4119) 
Add query parameters which are needed by AkamaiHD F4M player.
Also, modernize a bit.
 2014-11-12 19:26:00 +02:00
Philipp Hagemeister
5ccaddf5b1 [goldenmoustache] Simplify (#4128) 2014-11-12 15:36:59 +01:00
Philipp Hagemeister
0b201a3134 Merge remote-tracking branch 'xantares/goldenmoustache' 2014-11-12 15:34:31 +01:00
Philipp Hagemeister
ffe38646ca [funnyordie] Remove test md5sum (Fixes #4113) 2014-11-12 15:33:15 +01:00
Philipp Hagemeister
c6afed48ff [YoutubeDL] guard against strange sys.stdouts 2014-11-12 15:30:26 +01:00
Michael Käufl
732c848c14 [abc] Update test case 
Old video has expired.
 2014-11-12 15:26:29 +01:00
Michael Käufl
9d2a4dae90 [allocine] Update test 2014-11-12 15:26:09 +01:00
Michael Käufl
7009a9047a [byutv] Update test 2014-11-12 15:24:37 +01:00
Philipp Hagemeister
28465df1ff [youjizz] Modernize (#4131) 2014-11-12 15:19:23 +01:00
Philipp Hagemeister
ef89dba58f [myspass] Modernize test case 2014-11-12 15:01:52 +01:00
Philipp Hagemeister
13ba3a6461 [bandcamp:album] Fix test case 2014-11-12 15:00:54 +01:00
Philipp Hagemeister
8f6ec4bbe6 release 2014.11.12.1 2014-11-12 11:44:26 +01:00
Jaime Marquínez Ferrándiz
c295490830 [YoutubeDL] Fix bug in the detection of formats that don't contain video (fixes #4150) 
If the format requested was not available, we called the method '.get' in None.
 2014-11-12 09:42:35 +01:00
Jaime Marquínez Ferrándiz
eb4cb42a02 [ted] Extract duration (closes #4155) 2014-11-12 09:30:57 +01:00
Philipp Hagemeister
7a8cbc72b2 release 2014.11.12 2014-11-12 08:46:34 +01:00
Pascal Brax
2774852c2f Fix MTV/GameTrailers "Bad Request" error 
Bugfix for bug #4123 & #4153
 2014-11-12 01:10:08 +01:00
Naglis Jonaitis
bbcc21efd1 [wrzuta] Fallback to mp3 on unknown media type (#4156) 2014-11-11 16:47:54 +02:00
Naglis Jonaitis
60526d6bcb [wrzuta] Fix audio extension lookup (Closes #4156) 
Also, replace deleted test case
 2014-11-11 16:23:06 +02:00
Philipp Hagemeister
1d4df56d09 release 2014.11.09 2014-11-09 22:32:41 +01:00
Philipp Hagemeister
a1cf99d03a [YoutubeDL] Add playlist_id and playlist_title fields (Fixes #4139) 2014-11-09 22:32:35 +01:00
Naglis Jonaitis
3c6af203cc [streamcloud] Match URLs without fname (Closes #4144) 
Also, modernize a bit.
 2014-11-09 22:00:51 +02:00
Naglis Jonaitis
1a92e086a7 [tapely] Add Referer header (Closes #4138) 2014-11-09 15:01:12 +02:00
Jaime Marquínez Ferrándiz
519c73f267 Merge pull request #4136 from andikmu/master 
fix swrmediathek for new formats.
 2014-11-09 12:17:18 +01:00
Jaime Marquínez Ferrándiz
a6dae6c09c [ndr] Improve video url regex (fixes #4140) 2014-11-09 11:15:50 +01:00
Jaime Marquínez Ferrándiz
f866e474f3 [YoutubeDL] Don't dowload formats for merging if the first doesn't contain the video (#4132) 2014-11-09 10:59:56 +01:00
Philipp Hagemeister
8bb9b97c97 Merge remote-tracking branch 'origin/master' 2014-11-09 08:30:12 +01:00
andi
d6fdc38682 fix swrmediathek for new formats. 2014-11-08 15:56:35 +01:00
Jaime Marquínez Ferrándiz
c2b61af548 [options] Document the syntax for merging formats (closes #3940, closes #4132) 2014-11-08 15:09:04 +01:00
Jaime Marquínez Ferrándiz
2fdbf27ad8 [niconico:playlist] Use the same video url the webpage uses (closes #4133) 2014-11-08 14:53:23 +01:00
yac
3898c8a7b2 [FreeVideo] Add new extractor 2014-11-08 00:13:28 +01:00
Naglis Jonaitis
29ed169cd6 [wrzuta] Add mp3 as a possible format (Closes #4126) 2014-11-07 22:53:54 +02:00
xantares
b868c972d1 Add support for goldenmoustache.com 2014-11-07 17:44:06 +00:00
Jaime Marquínez Ferrándiz
9908e03528 Merge pull request #4076 from ghedo/direct_type 
[generic] indicate when a direct video has been extracted
 2014-11-06 22:23:14 +01:00
Jaime Marquínez Ferrándiz
1fe8fb8c20 [vice] Re-add extractor (fixes #4120) 
The generic extraction no longer works.
 2014-11-06 21:44:07 +01:00
Naglis Jonaitis
5d63b0aa93 [goshgay] Fix title extraction and modernize 
Also remove width and height as they are not of the actual video.
 2014-11-06 01:19:20 +02:00
Philipp Hagemeister
4164f0117e [utils] Remove unused import 2014-11-05 23:56:54 +01:00
Naglis Jonaitis
37aab27808 [brightcove] Extract m3u8 formats (#3541) 2014-11-06 00:14:33 +02:00
Jaime Marquínez Ferrándiz
6110bbbfdd [niconico] Catch deleted videos (closes #4064) 2014-11-05 19:52:34 +01:00
Jaime Marquínez Ferrándiz
cde9b380e6 Merge pull request #4110 from nemunaire/channel9-fix 
[channel9] Fix extraction
 2014-11-05 19:03:24 +01:00
Sergey M․
dab647a7b6 [cinemassacre] Keep both extraction approaches and make more robust (Closes #4109) 2014-11-05 21:32:46 +07:00
nemunaire
a316a83d2b [channel9] Fix extraction 2014-11-05 11:23:11 +01:00
Naglis Jonaitis
81b22aee8b [izlesene] Update test cases and modernize 
The timestamp fluctuates with DST.
 2014-11-05 01:00:33 +02:00
Philipp Hagemeister
a80c96eab0 release 2014.11.04 2014-11-04 23:42:09 +01:00
Philipp Hagemeister
20436c30c9 [youtube] Clarify output 2014-11-04 23:35:34 +01:00
Philipp Hagemeister
3828505646 [utils] Use a regexp instead of HTMLParser for get_element_by_attribute 2014-11-04 23:33:43 +01:00
Philipp Hagemeister
11fba1751d [imdb] Simplify 2014-11-04 23:26:23 +01:00
Philipp Hagemeister
12ea2f30cf [utils] Remove unused get_meta_content function 2014-11-04 23:20:39 +01:00
Philipp Hagemeister
9c3e870393 [gamespot] Remove unused import 2014-11-04 23:17:43 +01:00
Philipp Hagemeister
44789f2457 [ustream] Use modern helper function instead of old HTML parser 2014-11-04 23:15:16 +01:00
Philipp Hagemeister
711ede6e1b [heise] Fix description, thumbnail and format ID 2014-11-04 23:14:16 +01:00
Philipp Hagemeister
a32f253112 [gamespot] Modernize 2014-11-04 23:04:12 +01:00
Philipp Hagemeister
94bd361318 [youtube] Skip sts if missing (Fixes #4095, fixes #4103) 2014-11-04 22:45:43 +01:00
Philipp Hagemeister
acd40f64ed [cnn] Modernize test definitions 2014-11-04 22:25:15 +01:00
Sergey M․
766306450d [played] Capture and output error message 2014-11-04 17:34:53 +07:00
Sergey M․
e7642ab572 [wimp] Fix video URL regex 2014-11-04 17:13:17 +07:00
Naglis Jonaitis
bdf9701729 [generic/brightcove] Add a new test case for kijk.nl (#3541) 2014-11-03 23:13:46 +02:00
Naglis Jonaitis
b5af6fcdad [brightcove] Make _VALID_URL less greedy and check for empty URLs (#3541) 2014-11-03 23:12:24 +02:00
Sergey M․
fdca55fe34 [trutube] Strip title 2014-11-03 20:14:18 +07:00
Jaime Marquínez Ferrándiz
4f195f55f0 Do not override stdlib html parser 'locatestarttagend' regex (fixes #4081) 
'<a href="foo" ><img src="bar" / ></a>' wouldn't be parsed right (the problem is '/ >', '/>' worked fine).
We need to change it in python 2.6 (for example the description of youtube videos wouldn't be extracted).
 2014-11-02 19:31:06 +01:00
Philipp Hagemeister
ecc0c5ee01 [utils] Modernize 2014-11-02 11:37:49 +01:00
Philipp Hagemeister
451948b28c [compat] Modernize 2014-11-02 11:36:29 +01:00
Philipp Hagemeister
baa708036c [compat] Fix imports 2014-11-02 11:26:40 +01:00
Philipp Hagemeister
8c25f81bee [util] Move compatibility functions out of util 
utils is large enough without these compatibility functions.

Everything that is present in newer versions of Python (i.e. with dev Python it's just an import) goes into compat.py .
Everything else (i.e. youtube-dl-specific helpers) goes into utils.py .
 2014-11-02 11:23:42 +01:00
Philipp Hagemeister
4c83c96795 [YoutubeDL] Include rtmpdump in exe versions -v output 2014-11-02 10:55:36 +01:00
Philipp Hagemeister
9580711841 [ffmpeg] Move version detection to utils 2014-11-02 10:50:30 +01:00
Philipp Hagemeister
c30ae9594c release 2014.11.02.1 2014-11-02 10:28:21 +01:00
Philipp Hagemeister
ffae28ae18 release 2014.11.02 2014-11-02 09:45:51 +01:00
Sergey M․
d9116714f2 [cinemassacre] Fix extraction (Closes #4083) 2014-11-02 08:01:14 +07:00
Alessandro Ghedini
ccdd0ffb80 [generic] indicate when a direct video has been extracted 
Fixes #4052.
 2014-11-01 15:34:00 +01:00
Sergey M․
5263cdfcf9 [generic] Improve MLB iframe regex 2014-11-01 04:01:58 +07:00
Sergey M․
b2a68d14cf [mlb] Improve _VALID_URL (Closes #4063) 2014-11-01 04:01:18 +07:00
Sergey M․
6e1cff9c33 [canalplus] Improve and merge with d8 extractor 2014-10-31 21:54:30 +07:00
Sergey M․
72975729c8 [canalplus] Tweak extractor to support piwiplus (Closes #4046) 2014-10-31 20:19:30 +07:00
Sergey M․
d319948b6a [funnyordie] Add articles URL test 2014-10-31 19:26:56 +07:00
anovicecodemonkey
2a834bdb21 [FunnyOrDie] Add support for "/articles/" URLs 2014-10-31 21:20:37 +10:30
Philipp Hagemeister
0d2c141865 [youtube] Detect formats 298 et al as mp4 (Fixes #4066) 2014-10-31 11:13:02 +01:00
Philipp Hagemeister
5ec39d8b96 release 2014.10.30 2014-10-30 09:53:48 +01:00
Philipp Hagemeister
7b6de3728a [youtube] Add format 266 (Fixes #4055) 2014-10-30 09:53:43 +01:00
Philipp Hagemeister
a51d3aa001 [youtube] Add support for formats 302 and 303 (Fixes #4060) 2014-10-30 09:43:11 +01:00
Philipp Hagemeister
2c8e03d937 Sort formats by fps as well 2014-10-30 09:40:52 +01:00
Philipp Hagemeister
fbb21cf528 [youtube] Add formats 298, 299 (Fixes #4056) 2014-10-30 09:34:13 +01:00
Naglis Jonaitis
b8a618f898 [ro220] Fix broken extractor and modernize (#4054) 2014-10-30 01:42:52 +02:00
Philipp Hagemeister
feb74960eb release 2014.10.29 2014-10-29 23:29:42 +01:00
Jaime Marquínez Ferrándiz
d65d628613 [crunchycroll] Fix building of ass subtitles (reported in #4019) 
Parse the xml document instead of using regexes, otherwise unicode characters are left unescaped.
 2014-10-29 21:19:20 +01:00
Philipp Hagemeister
ac645ac7d0 [generic] Allow soundcloud embeds with additional attributes 2014-10-29 20:27:58 +01:00
Philipp Hagemeister
7d11297f3f Merge branch 'master' of github.com:rg3/youtube-dl 2014-10-29 20:10:07 +01:00
Philipp Hagemeister
6ad4013d40 [drtv] Allow fractional timestamps (Fixes #4059) 2014-10-29 20:10:00 +01:00
Sergey M․
dbd1283d31 [naver] Capture and output error message (#4057) 2014-10-29 21:50:37 +07:00
Sergey M․
c451d4f553 [trutube] Fix extraction 2014-10-29 21:16:10 +07:00
Jaime Marquínez Ferrándiz
a9bad429b3 [niconico] Add extractor for playlists (closes #4043) 2014-10-29 11:04:48 +01:00
Philipp Hagemeister
50c8266ef0 Merge branch 'master' of github.com:rg3/youtube-dl 2014-10-28 23:40:44 +01:00
Philipp Hagemeister
00edd4f9be [laola1tv] Mark as broken 
When the f4m downloader gets live stream support, I expect this to work magically or with very minor changes.
 2014-10-28 17:29:27 +01:00
Philipp Hagemeister
ee966928af [f4m] Support bootstrap URLs 2014-10-28 17:27:41 +01:00
Philipp Hagemeister
e5193599ec [laola1tv] Add new extractor 
The extractor works fine, but the f4m downloader cannot handle the resulting bootstrap information.
 2014-10-28 16:51:34 +01:00
Philipp Hagemeister
01d663bca3 [auengine] Simplify 2014-10-28 15:51:15 +01:00
Sergey M․
e0c51cdadc [vk] Generalize errors 2014-10-28 21:35:25 +07:00
Sergey M․
9334f8f17a [vk] Handle deleted videos 2014-10-28 21:06:07 +07:00
Sergey M․
632256d9ec [wimp] Update video URL regex 2014-10-28 20:35:02 +07:00
Philipp Hagemeister
3511266bc3 [YoutubeDL] Simplify API of YoutubeDL 
Calling add_default_extractors twice should be harmless since the first set of extractors will match.
 2014-10-28 12:54:29 +01:00
Philipp Hagemeister
9fdece5d34 [srmediathek] Choose variable name more wisely 2014-10-28 10:44:47 +01:00
Philipp Hagemeister
bbf1092ad0 [fktv] Remove unused import 2014-10-28 10:44:17 +01:00
Philipp Hagemeister
9ef55c5bbc [quickvid] Add new extractor 2014-10-28 10:41:37 +01:00
Philipp Hagemeister
48a24ab746 [generic] Fix HTML5 video regexp 2014-10-28 10:41:24 +01:00
Philipp Hagemeister
27c542c06f [iconosquare] Simplify 2014-10-28 09:12:28 +01:00
Philipp Hagemeister
b2e6a1c14c release 2014.10.27 2014-10-27 02:44:07 +01:00
Philipp Hagemeister
8cc3eba79a [phoenix] Add new extractor (Fixes #4036) 2014-10-27 02:43:59 +01:00
Philipp Hagemeister
b0fb6d4db1 [ku6] Modernize 2014-10-27 02:32:44 +01:00
Philipp Hagemeister
81515ad9f6 [extractor/common] Improve m3u8 output 2014-10-27 02:28:37 +01:00
Philipp Hagemeister
8112d4b284 [lrt] Modernize 2014-10-27 02:27:49 +01:00
Philipp Hagemeister
bf7aa6301b [fktv] Modernize 2014-10-27 02:26:05 +01:00
Philipp Hagemeister
aea856621f [zdf] Simplify 2014-10-27 02:14:07 +01:00
Philipp Hagemeister
f24a5a2faa Merge remote-tracking branch 'olebowle/ard' 2014-10-27 01:36:50 +01:00
Philipp Hagemeister
ecfe623422 [heise] Fix extraction 
Now they use an XML format instead of JSON.
 2014-10-27 01:33:51 +01:00
Philipp Hagemeister
4a6c94288a [kickstarter] Simplify and fix test case 2014-10-27 01:16:18 +01:00
Philipp Hagemeister
10e3d73472 [nbc] Fix ThePlatform embedded videos 2014-10-27 01:14:17 +01:00
Philipp Hagemeister
15956b5aa1 [promptfile] Fix check for deleted videos 2014-10-27 00:50:22 +01:00
Philipp Hagemeister
586f7082ef [francetv] Remove changing md5sum 2014-10-27 00:46:34 +01:00
Philipp Hagemeister
d6d9186f0d [generic] Fix test title 2014-10-27 00:45:15 +01:00
Philipp Hagemeister
2e9ff8f362 [gorillavid] Fix test title 2014-10-27 00:44:27 +01:00
Philipp Hagemeister
249efaf44b [pornhub] Modernize and fix test definition 2014-10-27 00:33:35 +01:00
Philipp Hagemeister
8d32abff9e [ruhd] Simplify 2014-10-27 00:20:54 +01:00
Philipp Hagemeister
94f052cbf4 [syfy] Remove test checksum 
We have the minsize test now.
 2014-10-27 00:19:15 +01:00
Philipp Hagemeister
446a03bd96 [ustream:channel] Change test playlist size (Seems to have been limited that way on the website as well) 2014-10-27 00:18:10 +01:00
Philipp Hagemeister
6009b69f81 [vgtv] Fix test title 2014-10-27 00:16:01 +01:00
Philipp Hagemeister
3d6047113c [vgtv] Simplify 2014-10-27 00:14:52 +01:00
Philipp Hagemeister
9dec99303d [vimeo:review] Fix test title 2014-10-27 00:13:40 +01:00
Philipp Hagemeister
7706927370 [vine:user] Adapt test to changed list size 2014-10-27 00:11:34 +01:00
Philipp Hagemeister
3adba6fa2a [xtube] Fix test description 2014-10-27 00:08:37 +01:00
Philipp Hagemeister
f46a8702cc [youtube:playlist] Fix test title 2014-10-27 00:06:47 +01:00
Philipp Hagemeister
8d11b59bbb [ynet] Remove test md5sums 
These fluctuate regularly.
 2014-10-27 00:06:00 +01:00
Philipp Hagemeister
cf501a23d2 [srmediathek] Correct IE_NAME/IE_DESC 2014-10-26 23:23:53 +01:00
Philipp Hagemeister
2bcae58d46 [srmediathek] New extractor 2014-10-26 23:23:10 +01:00
Philipp Hagemeister
c9f08154a3 Remove unused imports 2014-10-26 23:13:42 +01:00
Philipp Hagemeister
526b276fd7 [faz] Modernize 2014-10-26 23:11:15 +01:00
Philipp Hagemeister
77ec444d9a release 2014.10.26.2 2014-10-26 21:49:52 +01:00
Philipp Hagemeister
bfc2bedcfc [youtube] Make confirm_age non-fatal (#4042) 2014-10-26 21:49:29 +01:00
Philipp Hagemeister
83855f3a1f [livestream:original] Fix RTMP parameters (Fixes #4040) 2014-10-26 21:44:29 +01:00
Philipp Hagemeister
50b51830fb [ffmpeg] Fix typo 2014-10-26 21:31:51 +01:00
Philipp Hagemeister
3d6eed9b52 release 2014.10.26.1 2014-10-26 21:03:38 +01:00
Philipp Hagemeister
1a253e134c [ffmpeg] Fix call to ffprobe (Fixes #4041) 2014-10-26 21:03:16 +01:00
Philipp Hagemeister
6194bb1419 [ffmpeg] Make downloader optional (Fixes #4039) 2014-10-26 21:00:42 +01:00
Philipp Hagemeister
37d66e7f1e [generic] Correct call to _webpage_read_full_content 2014-10-26 20:58:09 +01:00
Philipp Hagemeister
70b7e3fbb6 [generic] Add a test case for direct links with broken HEAD (#4032) 2014-10-26 20:49:51 +01:00
Jaime Marquínez Ferrándiz
579657ad87 [soundcloud] Set the 'webpage_url' field for each track 
For playlists, YoutubeDL would set it to the playlist url.
 2014-10-26 19:08:36 +01:00
Jaime Marquínez Ferrándiz
5f82b129e0 [ffmpeg] Also look into stderr for extracting the version 
At least with avconv 11, it will print 'avconv version 11, ..' to stderr, not stdout.
 2014-10-26 18:11:31 +01:00
Philipp Hagemeister
64269e4d01 Move AUTHORS to root (closes #2985) 2014-10-26 18:01:00 +01:00
Philipp Hagemeister
d481699a7a release 2014.10.26 2014-10-26 17:29:27 +01:00
Philipp Hagemeister
5894a4f4ee Credit @gabeos for crunchyroll:playlist (#3988) 2014-10-26 17:29:02 +01:00
Philipp Hagemeister
09e5d6a6e5 [crunchyroll:playlist] Simplify (#3988) 2014-10-26 17:28:09 +01:00
Philipp Hagemeister
274b12b5a8 Merge remote-tracking branch 'gabeos/crunchyroll-show-playlist' 2014-10-26 17:06:35 +01:00
Philipp Hagemeister
23be51d8ce [generic] Handle audio streams that do not implement HEAD (Fixes #4032) 2014-10-26 17:05:44 +01:00
Philipp Hagemeister
488447455d [ffmpeg] Warn if ffmpeg/avconv version is too old (Fixes #4026) 2014-10-26 16:46:34 +01:00
Philipp Hagemeister
d28b517154 [YoutubeDL] Output avconv/ffmpeg versions if -v is given 2014-10-26 16:31:52 +01:00
Philipp Hagemeister
a7e97f6db1 [generic] Allow new SWFObject()-style imports 
This embed style is used on http://www.bitburger-open.de/ , but that is not included as a test case since the format is likely to be temporary.
 2014-10-26 14:15:49 +01:00
Sergey M․
f889cea109 Merge branch 'compat-getenv-and-expanduser' of https://github.com/dstftw/youtube-dl into dstftw-compat-getenv-and-expanduser 
Conflicts:
	test/test_utils.py
	youtube_dl/__init__.py
 2014-10-26 19:56:52 +07:00
Jaime Marquínez Ferrándiz
1bdeb7be2e Set '--simulate' if any of the printing options is given (fixes #3036) 
That's what the help messages say.
Previously it would only set '--skip-download', which would write thumbnail,
descriptions or subtitles if they were requested (for example you may have set
'--write-thumbnail' in the config file).
 2014-10-26 13:01:57 +01:00
Sergey M․
911344e5ac [vrt] Improve extractor 2014-10-26 16:48:11 +07:00
dinesh
03936f6e6d [BelgianNational] corrected indentation 2014-10-26 13:47:41 +05:30
dinesh
b13ccb1b87 [BelgianNational] New extractor added 2014-10-26 13:35:00 +05:30
Sergey M․
f64f8a4662 [sportbox] Remove view count 2014-10-26 08:00:01 +07:00
Jaime Marquínez Ferrándiz
681b9caa9c [tumblr] Fix extraction (fixes #4029) 2014-10-25 22:42:56 +02:00
Jaime Marquínez Ferrándiz
0eb9fb9f24 [soundcloud] Modernize and fix tests 2014-10-25 22:32:01 +02:00
Naglis Jonaitis
9a76f416ce [lrt] Updated test 2014-10-25 13:24:46 +03:00
Philipp Hagemeister
603821161f Merge branch 'master' of github.com:rg3/youtube-dl 2014-10-25 09:55:05 +02:00
Philipp Hagemeister
d3c72db894 [audiomack] Simplify 2014-10-25 08:58:03 +02:00
Sergey M․
43d9718fb9 [nhl] Improve video URL extraction (Closes #4013) 2014-10-25 13:56:21 +07:00
Philipp Hagemeister
7fc54e5262 Merge remote-tracking branch 'xavierbeynon/audiomack' 2014-10-25 08:55:12 +02:00
Philipp Hagemeister
ec9c978481 Credit @winwon for vidzi (#3989) 2014-10-25 08:42:53 +02:00
xavier
d36cae46d8 Not directly calling soundcloud extractor anymore 2014-10-24 21:11:46 -05:00
xavier
fdfefa1b9c Made changes per phihag 2014-10-24 21:07:01 -05:00
Philipp Hagemeister
724d031893 release 2014.10.25 2014-10-25 00:41:06 +02:00
Philipp Hagemeister
63e0be3415 New option --dump-single-json (#4003) 2014-10-25 00:30:57 +02:00
Philipp Hagemeister
c64ed2a310 [viddler] Use API 2014-10-25 00:11:12 +02:00
Philipp Hagemeister
cdc5cb7c2b [hark] Modernize 2014-10-24 22:31:55 +02:00
Philipp Hagemeister
8efd06aa42 [motherless] Simplify 2014-10-24 19:53:48 +02:00
Filip B
7f9ced64cb Add group videos support for motherless 
Modified motherless regular expression.
Previously it matched only URLs like this:
motherless.com/ID
Now it also matches this:
motherless.com/g/group_name/ID
All tests including the newly added one passed.
 2014-10-24 21:44:21 +04:00
Filip B
7608815cc2 Add another motherless test 
This test is for videos posted in groups.
URL looks like this:
motherless.com/g/group_name/ID
which is basically the same as
motherless.com/ID
So far this test fails because I haven't improved the extractor yet.
 2014-10-24 21:43:27 +04:00
Filip B
5823eda139 Fix motherless test 0 
Apparently motherless no longer serves flv for that video (or maybe even
other videos). So I changed expected extension from flv to mp4 and
changed expected md5 accordingly.
 2014-10-24 21:26:32 +04:00
Philipp Hagemeister
e82c1e9a6e [YoutubeDL] Do not apply playlist info to videos when extract_flat is set (#4003) 2014-10-24 16:13:45 +02:00
Philipp Hagemeister
1ede5b2481 [glide] Simplify 2014-10-24 15:34:19 +02:00
Philipp Hagemeister
964ae0a122 Credit @thornomad for glide (#3944) 2014-10-24 15:29:44 +02:00
Philipp Hagemeister
98e1d28982 Merge remote-tracking branch 'thornomad/glide' 2014-10-24 15:29:03 +02:00
Philipp Hagemeister
2c26df763c [vidzi] Use proper test case and simplify (#3989) 2014-10-24 15:27:02 +02:00
Philipp Hagemeister
018e835594 [vidzi] Simplify 2014-10-24 15:17:17 +02:00
Philipp Hagemeister
e65e06fbe2 [vidzi] Correct order in imports (#3989) 2014-10-24 15:15:54 +02:00
winwon
95ee84421e vidzi Add new extractor 2014-10-24 15:15:13 +02:00
Philipp Hagemeister
2acfe95f58 Credit @capital-G for bild.de (#3983) 2014-10-24 15:12:29 +02:00
Philipp Hagemeister
b5a14350b9 [bild] Simplify (#3983) 2014-10-24 15:10:32 +02:00
Philipp Hagemeister
8d81f872fb Merge remote-tracking branch 'capital-G/master' 2014-10-24 15:02:50 +02:00
Philipp Hagemeister
36f1c90497 release 2014.10.24 2014-10-24 14:48:19 +02:00
Philipp Hagemeister
057a5206cc Add --flat-playlist option (Closes #4003) 2014-10-24 14:48:12 +02:00
xavier
9e9bc793f3 Finished audiomack extractor 2014-10-23 23:54:59 -05:00
xavier
5c565ac9e7 Added init.py initializer 2014-10-23 16:58:11 -05:00
xavier
67500bf939 Initial version of audiomack.py 2014-10-23 16:55:39 -05:00
Philipp Hagemeister
b1edd7a48a [crunchyroll] Correct parsing (Fixes #4014) 2014-10-23 23:25:02 +02:00
Jaime Marquínez Ferrándiz
2c63ccec78 [mitele] Fix on python 2.x 2014-10-23 21:26:48 +02:00
Philipp Hagemeister
f2f2c0c2c6 [generic] Allow --default-search without colon 2014-10-23 21:13:45 +02:00
Philipp Hagemeister
4661e243f8 release 2014.10.23 2014-10-23 20:21:38 +02:00
Philipp Hagemeister
f3cd403c2b [telecino] Add coding declaration 2014-10-23 20:21:27 +02:00