Commit Graph

6883 Commits

Author SHA1 Message Date
Yen Chi Hsuan 0954cd8aa4 [Cinemassacre] Add detection for videos from blip.tv 2015-04-21 13:48:02 +08:00
Yen Chi Hsuan da55dac047 [CSpan] Removed the md5 sum of CSpan_3 2015-04-21 05:22:23 +08:00
Yen Chi Hsuan 13a11b195f [SenateISVP] Fix tests
Remove md5 sums. They differs from my PC and the travis worker.
2015-04-21 05:13:25 +08:00
Yen Chi Hsuan 92dcba1e1c [CSpan] Fix test cases CSpan_1 and CSpan_2 2015-04-21 03:30:54 +08:00
Yen Chi Hsuan 2fe1b5bd2a [CSpan] Add detection for Senate ISVP. Closes #5302 2015-04-21 03:18:38 +08:00
Yen Chi Hsuan f91e1a8739 [Senate] Try to capture thumbnails 2015-04-21 02:57:32 +08:00
Yen Chi Hsuan 24e21613b6 [bilibili] Capture the video-not-exist message 2015-04-21 02:32:10 +08:00
Yen Chi Hsuan c6391cd587 [Senate] Add new extractor (#5302) 2015-04-21 02:29:56 +08:00
Sergey M․ 006ce15a0c [bambuser] Add support for authentication (#5478) 2015-04-20 23:00:37 +06:00
Sergey M․ edf4216119 [bambuser] Modernize and extract more metadata 2015-04-20 22:46:01 +06:00
Sergey M․ ae8953409e [bambuser] Capture and output error message (#5478) 2015-04-20 22:35:53 +06:00
Sergey M․ bda44f31a1 [bambuser] Modernize 2015-04-20 22:33:35 +06:00
Sergey M․ 6621ca39a3 [ted] Skip hls quality selection format 2015-04-20 22:04:42 +06:00
Sergey M․ 14f7abfa71 [ted] Lower preference for direct audio since it's mono 2015-04-20 22:04:17 +06:00
Sergey M․ 0f0b5736da [ted] Fix hls audio/video-only formats 2015-04-20 22:01:02 +06:00
Sergey M․ 6728187ac0 [YoutubeDL] mp3 is compatible with mp4 2015-04-20 21:58:46 +06:00
Sergey M․ 17c8675853 [YoutubeDL] Allow bestvideo+bestaudio/best strategy for ted extractor 2015-04-20 21:58:29 +06:00
Sergey M․ cfbee8a431 [ted] Clarify IE_NAME 2015-04-20 21:42:42 +06:00
Sergey M․ 736785ab63 [ted] Clarify audio/video-only formats 2015-04-20 21:42:20 +06:00
Sergey M․ 3ded7bac16 [extractor/common] Add ability to specify custom field preference for `_sort_formats` 2015-04-20 21:13:31 +06:00
Quentin Rameau b524a001d6 [bandcamp] fix video_id parsing (fixes #4861) 2015-04-20 15:45:57 +02:00
Jaime Marquínez Ferrándiz a380509259 Move the documentation for the `--format` option to the manpage
It's too big for beeing embedded in the help message and it's easier to edit in the markdown file.
2015-04-19 18:53:28 +02:00
Sergey M․ c0dea0a782 [YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as well 2015-04-19 22:33:52 +06:00
Sergey M․ 81cd954a51 [YoutubeDL] Merge incompatible formats into mkv (#5456) 2015-04-19 17:55:42 +02:00
Sergey M․ feccf29c87 [YoutubeDL] Make `bestvideo+bestaudio/best` default format when merger is available 2015-04-19 17:51:56 +02:00
Jaime Marquínez Ferrándiz 5b5fbc0867 Detect already merged videos
Without the '--keep-video' option the two files would be downloaded again and even using the option, ffmpeg would be run again, which for some videos can take a long time.
We use a temporary file with ffmpeg so that the final file only exists if it success
2015-04-19 17:51:41 +02:00
Yen Chi Hsuan f158799bbe [Sohu] Fix title extraction 2015-04-19 19:19:44 +08:00
Yen Chi Hsuan 8b0e8990c2 [miomio] Replace the slow test case
MioMio_1 takes about 25~35 seconds on information retrieval
2015-04-19 19:12:23 +08:00
Sergey M․ 163965d861 [megavideoz] Improve non-existing videos check 2015-04-19 04:14:58 +06:00
Sergey M․ 6e218b3f9a [megavideoz] Check non-existing videos 2015-04-19 04:09:01 +06:00
Sergey M․ cc9b9df0b6 [megavideozeu] Rename extractor 2015-04-19 04:08:29 +06:00
Sergey M․ 31f224008e [megavideozeu] Simplify (Closes #5454) 2015-04-19 04:07:45 +06:00
Jeff Buchbinder f32cb5cb14 [megavideoez] Add working test 2015-04-19 04:06:45 +06:00
Jeff Buchbinder fec2d97ca2 Add megavideoz.eu support. 2015-04-19 04:06:27 +06:00
hedii 8f4e8bf280 Update wat.py
line 116, modify 'Downloding' to 'Downloading'.
It looks like nothing, but it is very annoying when youtube-dl command's output is parsed to find progress on a php (or other language) website for example.
2015-04-18 15:40:40 +02:00
Jaime Marquínez Ferrándiz cc36e2295a [ign] Fix extraction of some videos in articles
Give higher preference to the hero-poster regex because some articles may contain other videos
2015-04-18 13:27:35 +02:00
Jaime Marquínez Ferrándiz d47aeb2252 FFmpegMergerPP: use the new system for specifying which files can be delete 2015-04-18 11:52:36 +02:00
Jaime Marquínez Ferrándiz 14523ed969 FFmpegEmbedSubtitlePP: remove the subtitle files if '--keep-video' is not given (closes #5435) 2015-04-18 11:44:42 +02:00
Jaime Marquínez Ferrándiz 592e97e855 Postprocessors: use a list for the files that can be deleted
We could only know if we had to delete the original file, but this system allows to specify us more files (like subtitles).
2015-04-18 11:36:42 +02:00
Yen Chi Hsuan 53faa3ca5f [facebook] Extend _VALID_URL take 2 (#5120) 2015-04-18 16:08:24 +08:00
Yen Chi Hsuan c62566971f [facebook] Extend _VALID_URL 2015-04-18 16:00:33 +08:00
Sergey M․ f52e66505a [gfycat] Simplify (Closes #5439, Closes #5394) 2015-04-18 03:50:22 +06:00
Sergey M․ ca75235d3d Merge branch 'gfycat' of https://github.com/julianrichen/youtube-dl into julianrichen-gfycat 2015-04-18 03:49:32 +06:00
Jaime Marquínez Ferrándiz ecc6bd1341 YoutubeDL.post_process: simplify keep_video handling
Since keep_video started as None we always set it to keep_video_wish unless it was None, so in the end keep_video == keep_video_wish. This should have been changed in f3ff1a3696, but I didn't notice it.
2015-04-17 22:38:14 +02:00
Jaime Marquínez Ferrándiz ce81b1411d FFmpegExtractAudioPP: Simplify handling of already existing files 2015-04-17 22:37:27 +02:00
Sergey M․ 7691a7a3bd [comedycentral] Fix feed uri request (Closes #5449, closes #5455) 2015-04-17 23:41:07 +06:00
Jaime Marquínez Ferrándiz 214e74bf6f [soundcloud] Raise an error instead of calling 'report_error' 2015-04-17 19:24:30 +02:00
Jaime Marquínez Ferrándiz c5826a491b [mixcloud] Simplify url extraction
On the tracks I tested the server number in the url from the webpage is valid
for the mp3 or the m4a file and any other number is invalid, it's a
waste of time to check them.
2015-04-17 19:02:49 +02:00
Sergey M․ d8e7ef04dc [vimple] Fix extraction (Closes #5448) 2015-04-17 22:56:26 +06:00
Jaime Marquínez Ferrándiz 08f2a92c9c InfoExtractor._search_regex: Suggest updating when the regex is not found (suggested in #5442)
Reuse the same message from ExtractorError
2015-04-17 14:55:24 +02:00
Philipp Hagemeister 3220c50f9a release 2015.04.17 2015-04-17 11:14:25 +02:00
Jaime Marquínez Ferrándiz 024ebb2706 [soundcloud] Handle 'secret_token' for 'w.soundcloud.com/player/?url=*' urls (fixes #5453) 2015-04-17 10:46:25 +02:00
FireDart 954352c4c0 [gfycat] Fixed preferences. 2015-04-16 18:11:30 -04:00
FireDart 4aec95f3c9 [gfycat] Updated tests. 2015-04-16 18:10:53 -04:00
Sergey M․ be531ef1ec [utils] Fix splitunc deprecation warning 2015-04-16 22:12:38 +06:00
Sergey M․ 65c1a750f5 [srf] Show display_id when present 2015-04-16 21:48:22 +06:00
Sergey M․ 5141249c59 [srf] Extend _VALID_URL 2015-04-16 21:47:42 +06:00
Sergey M․ 6225984681 [generic] Update pladform embed test 2015-04-16 21:37:15 +06:00
Sergey M․ 5cb91ceaa5 [pladform] Update test 2015-04-16 21:33:01 +06:00
Sergey M․ 89c09e2a08 [srf] Update test 2015-04-16 21:30:13 +06:00
Sergey M․ fbbb219409 [srf] Fix direct links ext 2015-04-16 21:28:21 +06:00
Sergey M․ 820b064804 [srf] Extract subtitles 2015-04-16 20:48:17 +06:00
Sergey M․ 355c524bfa [srf] Extract all formats and prefer direct links over hls and hds 2015-04-16 20:31:02 +06:00
Yen Chi Hsuan c052ce6cde [Srf] Add new extractor (fixes #981) 2015-04-16 22:00:45 +08:00
Yen Chi Hsuan c9a779695d [extractor/common] Add the encoding parameter
The QQMusic info extractor need forced encoding for correct working.
2015-04-16 17:34:54 +08:00
Yen Chi Hsuan a685ae511a [QQMusic] Song extractor: Add lyrics as description
Note: Test fails on python 3 due to encoding issues
2015-04-16 17:34:54 +08:00
Yen Chi Hsuan 5edea45fab [QQMusic] Add album info extractor 2015-04-16 17:34:54 +08:00
Yen Chi Hsuan 8afff9f849 [QQMusic] Add singer info extractor 2015-04-16 17:34:54 +08:00
Yen Chi Hsuan a2043572aa [QQMusic] Implement the guid algorithm 2015-04-16 17:34:54 +08:00
Yen Chi Hsuan 5d98908b26 [QQMusic] Add new extractor 2015-04-16 17:34:54 +08:00
Yen Chi Hsuan d6fd958c5f [generic] Extract videos from SMIL manifests (closes #5145 and fixes #5135) 2015-04-16 17:16:11 +08:00
Yen Chi Hsuan d0eb724e22 [UDNEmbed] Enhance error checking and extend _VALID_URL 2015-04-16 17:04:53 +08:00
FireDart afe4a8c769 [gfycat] Add new extractor 2015-04-15 22:17:45 -04:00
Yen Chi Hsuan 9fc03aa87c [brightcove] Always return lists from _extract_brightcove_urls
In Python 3, filter() returns an iterable object, which is equivalently
to True even for an empty result set. It causes false positive playlists
in generic extraction logic.
2015-04-16 00:27:39 +08:00
Sergey M․ c798f15b98 [generic] Add test for playwire embed (#5430) 2015-04-15 22:14:29 +06:00
Sergey M․ 2dcc114f84 [generic] Add support for playwire embeds (Closes #5430) 2015-04-15 22:10:08 +06:00
Sergey M․ 0dfe9bc9d2 [mtv] Capture and output error message (#5420) 2015-04-15 21:02:34 +06:00
Sergey M․ 4d1cdb5bfe [spike] Extend _VALID_URL (Closes #5420) 2015-04-15 20:58:48 +06:00
Yen Chi Hsuan 9c5335a027 [teamcoco] Fix "preload" data extraction (fixes #5179) 2015-04-15 19:56:21 +08:00
Yen Chi Hsuan ae849ca170 [tumblr] Dismiss warnings for optional fields (fixes #5202) 2015-04-15 17:45:28 +08:00
Sergey M․ 94c1255782 [brightcove] Handle non well-formed XMLs (#5421) 2015-04-14 17:50:53 +06:00
Sergey M․ 476e1095fa [brightcove] Improve brightcove experience regex (Closes #5421) 2015-04-14 17:48:41 +06:00
Yen Chi Hsuan 8da1bb0418 [miomio] Enhance error checking and replace dead test case 2015-04-14 15:27:56 +08:00
Yen Chi Hsuan 01c58f8473 [generic] Fix test generic_51
The website replaced the original video with a new one
2015-04-14 13:10:10 +08:00
Yen Chi Hsuan edfcf7abe2 [generic] Support another type of Ooyala embedded video 2015-04-14 12:45:43 +08:00
Jaime Marquínez Ferrándiz 37b44fe7c1 [postprocessor/atomicparsley] Don't try to remove the temporary and original files if the format is unsupported (fixes #5419) 2015-04-13 22:50:40 +02:00
Sergey M․ 8f02ad4f12 [youtube] Simplify 2015-04-13 20:28:16 +06:00
Yen Chi Hsuan 51f1244600 [vine] flake8 2015-04-13 19:26:15 +08:00
Sergey M․ 7bd930368c [youtube] Remove unused variable 2015-04-13 00:08:39 +06:00
Sergey M․ fb69240ca0 [youtube] Extract video titles for channel playlist if possible (Closes #4971) 2015-04-12 23:19:00 +06:00
Sergey M․ 830d53bfae [utils] Add `video_title` for `url_result` 2015-04-12 23:11:47 +06:00
Sergey M․ c36a959549 [YoutubeDL] Try to download worst audio+video served by a single file first (Closes #5408) 2015-04-12 17:36:29 +06:00
Sergey M․ ac58e68bc3 [footyroom] Remove superfluous whitespace 2015-04-12 17:11:11 +06:00
Sergey M․ 504c1cedfe [footyroom] Improve 2015-04-12 17:09:52 +06:00
snipem 9a4d8fae82 [FootyTube] Fixed wrong md5 checksum 2015-04-12 17:01:12 +06:00
snipem 7d2ba6394c [FootyRoom] Fixed missing http prefix
For some reason FootyTube is missing the „http:“ prefix on some
Playwire links for some videos
2015-04-12 17:01:03 +06:00
Sergey M․ b04b94da5f [options] Fix file based configurations for python 2 (Closes #5401) 2015-04-12 03:57:56 +06:00
Sergey M․ ed5641e249 [crooksandliars] Quotes consistency 2015-04-11 20:27:39 +06:00
Sergey M․ a4257017ef [generic] Add tests for Crooks and Liars embeds 2015-04-11 20:26:42 +06:00
Sergey M․ 18153f1b32 [generic] Add support for Crooks and Liars embeds 2015-04-11 20:20:20 +06:00
Sergey M․ 7a91d1fc43 [crooksandliars] Improve embed extractor and remove article extractor 2015-04-11 20:03:12 +06:00
Sergey M․ af14ded75e Merge branch 'crooksandliars' of https://github.com/fstirlitz/youtube-dl into fstirlitz-crooksandliars 2015-04-11 19:34:06 +06:00
Sergey M․ 65939effb5 [hitbox:live] Fix hls extration (Closes #5315) 2015-04-11 18:52:41 +06:00
Sergey M․ 66ee7b3234 [ted] Extract all formats (Closes #5397) 2015-04-10 23:36:28 +06:00
Sergey M․ cd47a628fc [rai] Add test for #5396 2015-04-10 22:44:41 +06:00
Sergey M․ d7c78decb0 [rai] Improve extraction 2015-04-10 22:44:33 +06:00
Sergey M․ 8749477ed0 [rai] Fix extraction (Closes #5396) 2015-04-10 22:44:24 +06:00
Naglis Jonaitis 7088f5b5fa [teamcoco] Extract duration 2015-04-10 02:03:38 +03:00
Naglis Jonaitis 5bb6328cb9 [teamcoco] Extract m3u8 URLs 2015-04-09 23:57:51 +03:00
Naglis Jonaitis ce9f47de99 [teamcoco] Fix extraction 2015-04-09 23:54:53 +03:00
Sergey M․ 4c4780c25e [vine] Modernize 2015-04-09 22:41:41 +06:00
Sergey M․ 64f1aba8f1 [vine] Extend _VALID_URL 2015-04-09 22:40:18 +06:00
Sergey M․ 3359fb661f [vine] Add tests for #5389 2015-04-09 22:37:54 +06:00
Sergey M․ 58a9f1b864 [vine] Fix post data regex (Closes #5389) 2015-04-09 22:32:48 +06:00
Sergey M․ 6ac41a4ef5 [vine] Zero rate videos is perfectly valid (#5389) 2015-04-09 22:32:22 +06:00
Sergey M․ aa2af7ba74 [dumpert] Add nsfw cookie (Closes #5382) 2015-04-09 19:53:00 +06:00
Jaime Marquínez Ferrándiz ce73839fe4 [rtve] Detect videos that are no longer available 2015-04-09 14:01:33 +02:00
Philipp Hagemeister 1dc2726f8d release 2015.04.09 2015-04-09 00:21:19 +02:00
Sergey M․ af76e8174d [dailymotion:user] Improve _VALID_URL (Closes #5380) 2015-04-09 02:25:31 +06:00
Sergey M․ 402a3efc92 [theplatform] Modernize 2015-04-08 22:29:10 +06:00
Sergey M․ 372f08c990 [theplatform] Fix for python 2.6
At least single depth level extraction...
2015-04-08 22:27:25 +06:00
Sergey M․ dd29eb7f81 [postprocessor/common:postprocessor/ffmpeg] Generalize utime 2015-04-08 21:40:31 +06:00
Sergey M. bca788ab1d Merge pull request #5376 from PeteHemery/ffmpeg-postproc-utime-bug
[ffmpeg] adding exception catching for call to os.utime in run_ffmpeg_multiple_files
2015-04-08 20:27:17 +05:00
Sergey M․ aef8fdba11 [theplatform] Allow <par> without <swtich> at all
Bare `wget` on http://link.theplatform.com/s/kYEXFC/22d_qsQ6MIRTl results in an XML without <switch> at all
but with <par> and <video> inside it. Let's handle this possible outcome as well.
2015-04-08 21:03:11 +06:00
Yen Chi Hsuan 0a1603634b [utils] Remove url_infer_protocol 2015-04-08 21:39:34 +08:00
Yen Chi Hsuan a662163fd5 [theplatform] Rework on <switch> inside <par> 2015-04-08 20:21:34 +08:00
Yen Chi Hsuan bd7a6478a2 [theplatform] Fix video url extraction (fixes #5340)
In SMIL 2.1, <switch> nodes may be enclosed in <par>. See
http://www.w3.org/TR/SMIL2/smil-timing.html#edef-par
2015-04-08 19:20:34 +08:00
Yen Chi Hsuan 4a20c9f628 [livestream] Extend _VALID_URL (fixes #5375) 2015-04-08 17:42:26 +08:00
Yen Chi Hsuan 418c5cc3fc [udn] Add new extractor 2015-04-08 17:26:51 +08:00
Pete Hemery cc55d08832 [ffmpeg] adding exception catching for call to os.utime in run_ffmpeg_multiple_files 2015-04-07 22:33:18 +01:00
Yen Chi Hsuan de5c545648 [youtube] Skip WebVTT in DASH manifest (#5297) 2015-04-08 03:47:27 +08:00
Sergey M․ a35099bd33 [addanime] Add test for #5372 2015-04-07 21:01:35 +06:00
Sergey M․ 5f4b5cf044 [addanime] Extend _VALID_URL (Closes #5372) 2015-04-07 21:00:52 +06:00
Sergey M․ beb10f843f [addanime] Add format quality (Closes #5371) 2015-04-07 21:00:22 +06:00
Philipp Hagemeister 29713e4268 [cnn] Match more affilliates 2015-04-07 14:59:13 +02:00
Jaime Marquínez Ferrándiz 8e4b83b96b Remove check for ssl certs
When it uses a capath instead of a cafile, 'get_ca_certs' or 'cert_store_stats' only returns certificates already used in a connection.
(see #5364)
2015-04-06 22:18:08 +02:00
Sergey M․ d97aae7572 [spankbang] Improve and simplify 2015-04-06 21:24:17 +06:00
Sergey M․ a55e2f04a0 Merge branch 'spankbang.com' of https://github.com/newtonelectron/youtube-dl into newtonelectron-spankbang.com 2015-04-06 20:46:40 +06:00
felix 6e53c91608 [crooksandliars] resolve protocol-relative URLs 2015-04-06 10:12:43 +02:00
felix d2272fcf6e crooksandliars.com extractor 2015-04-06 09:54:19 +02:00
newtonelectron c7ac5dce8c [SpankBang] Remove regexp type prefix from _TEST url. 2015-04-05 14:02:05 -07:00
newtonelectron 5c1d459ae9 [SpankBang] Add test 2015-04-05 13:57:59 -07:00
newtonelectron 2e7daef502 [SpankBang] Use python2.6 compatible string formatting spec 2015-04-05 13:43:21 -07:00
newtonelectron 6410229681 [SpankBang] Add new extractor 2015-04-05 12:50:21 -07:00
Sergey M․ e40bd5f06b [youtube] Simplify url_encoded_fmt_stream_map check 2015-04-06 00:45:57 +06:00
Sergey M․ 06b491eb7b [youtube] Add test for #5361 2015-04-06 00:35:55 +06:00
Yen Chi Hsuan 3a9fadd6df [youtube] Enhance url_encoded_fmt_stream_map checking (fix #5361) 2015-04-05 22:29:06 +08:00
Sergey M․ 0de9312a7e [ellentv] Replace test 2015-04-05 00:01:55 +06:00
Sergey M․ 27fe5e3473 [ellentv] Make video url extraction fatal 2015-04-05 00:00:04 +06:00
Sergey M․ f67dcc09f5 [eagleplatform] Skip georestricted test 2015-04-04 23:36:45 +06:00
Sergey M․ fefc9d121d [dump] Fix title extraction 2015-04-04 23:33:07 +06:00
Sergey M․ a319c33d8b [dreisat] Update test 2015-04-04 23:30:38 +06:00
Sergey M․ 218d6bcc05 [dreisat] Capture status errors 2015-04-04 23:28:47 +06:00
Sergey M․ 7d25463972 [drtv] Update test 2015-04-04 23:19:28 +06:00
Sergey M․ aff84bec07 [drtv] Check for unavailable videos 2015-04-04 23:17:09 +06:00
Sergey M․ ac651e974e [culturebox] Fix test 2015-04-04 23:06:16 +06:00
Sergey M․ e21a55abcc [extractor/common] Remove f4m section
It's now provided by `f4m_id`
2015-04-04 23:05:25 +06:00
Sergey M․ bc03228ab5 [francetv] Improve formats extraction 2015-04-04 23:02:04 +06:00
Sergey M․ f05d0e73c6 [francetv] Fix duration 2015-04-04 22:52:25 +06:00
Sergey M․ aed2d4b31e [culturebox] Replace test 2015-04-04 22:50:13 +06:00
Sergey M․ 184a197441 [culturebox] Check for unavailable videos 2015-04-04 22:43:34 +06:00
Sergey M․ ed676e8c0a [bliptv] Check format URLs
Some formats are now 404
2015-04-04 22:27:25 +06:00
Sergey M․ 8e1f937473 [aftonbladet] Modernize 2015-04-04 22:19:34 +06:00
Sergey M․ 1a68d39211 [aftonbladet] Fix extraction 2015-04-04 22:15:59 +06:00
Sergey M․ 1a48181a9f [options] Fix load info help string 2015-04-04 20:09:11 +06:00
Sergey M․ 6b70a4eb7d [options] `Number` is a verb here 2015-04-04 20:02:29 +06:00
Sergey M․ f01855813b [options] extractor is lowercase 2015-04-04 20:01:24 +06:00
Sergey M․ 4a3cdf81af [options] Restore some strings 2015-04-04 20:00:23 +06:00
Sergey M․ f777397aca Merge branch 'patch-1' of https://github.com/tuexss/youtube-dl into tuexss-patch-1 2015-04-04 19:50:47 +06:00
Sergey M․ 8fb2e5a4f5 [radiojavan] Sort formats 2015-04-04 19:25:08 +06:00
Sergey M․ 4e8cc1e973 [radiojavan] Fix height 2015-04-04 19:24:37 +06:00
Sergey M․ 7c39a65543 [pornovoisines] Simplify 2015-04-04 19:13:37 +06:00
Sergey M․ 15ac8413c7 [utils] Avoid treating `*-%Y` date template as UTC offset 2015-04-04 19:08:48 +06:00
Sergey M․ 79c21abba7 [utils] Add one more template to unified_strdate 2015-04-04 18:45:46 +06:00
Sergey M․ d5c418f29f Merge branch 'pornovoisines' of https://github.com/Roman2K/youtube-dl into Roman2K-pornovoisines 2015-04-04 18:08:20 +06:00
Sergey M․ 536b94e56f Merge branch 'snipem-gamersyde' 2015-04-04 17:54:02 +06:00
Sergey M․ 5c29dbd0c7 [gamersyde] Simplify 2015-04-04 17:53:22 +06:00
Sergey M․ ba9e68f402 [utils] Drop trailing comma before closing brace 2015-04-04 17:48:55 +06:00
Jaime Marquínez Ferrándiz e9f65f8749 [rtve] Extract a better quality video 2015-04-04 13:11:55 +02:00
Sergey M․ ae0dd4b298 Merge branch 'gamersyde' of https://github.com/snipem/youtube-dl into snipem-gamersyde 2015-04-04 16:59:39 +06:00
Sergey M․ 7cf97daf77 [radiojavan] Simplify and extract upload date 2015-04-04 16:45:41 +06:00
snipem 3d24d997ae Fixed intendation of test cases
Leaded to error on Linux machine
2015-04-04 12:42:14 +02:00
snipem 115c281672 [Gamersyde] Improved robustness, added duration and tests
Fix for Json syntax is now less error prone for Json syntax inside of
values. Extractor is now also using native Json handling. Added tests
for several videos that were producing errors in the first place.
2015-04-04 12:31:48 +02:00
Sergey M․ cce23e43a9 Merge branch 'radiojavan' of https://github.com/mtp1376/youtube-dl into mtp1376-radiojavan 2015-04-04 16:10:17 +06:00
Sergey M․ ff556f5c09 Do not encode outtmpl twice (Closes #5288) 2015-04-04 00:30:37 +06:00
Sergey M․ 16fa01291b [prosiebensat1] Fix test 2015-04-03 23:44:13 +06:00
Sergey M․ 01534bf54f [prosiebensat1] Fix bitrate (Closes #5350 closes #5351) 2015-04-03 23:42:53 +06:00
Jaime Marquínez Ferrándiz cd341b6e06 [mixcloud] Fix extraction of like count (reported in #5231) 2015-04-03 19:37:35 +02:00
Mohammad Teimori Pabandi 185a7e25e7 [RadioJavan] Add new extractor 2015-04-03 20:55:39 +04:30
snipem e81a474603 [Gamersyde] Add new extractor 2015-04-03 15:34:49 +02:00
Jaime Marquínez Ferrándiz ff2be6e180 [bloomberg] Adapt to website changes (fixes #5347) 2015-04-03 15:01:17 +02:00
Jaime Marquínez Ferrándiz 3da4b31359 [postprocessor/ffmpeg] Fix crash when ffprobe/avprobe are not installed (closes #5349)
'self.probe_basename' was None, so 'probe_executable' raised a KeyError exception
2015-04-03 14:09:50 +02:00
Jaime Marquínez Ferrándiz 4bbeb19fc7 [miomio] pep8: remove whitespaces in empty line 2015-04-03 14:09:07 +02:00
Philipp Hagemeister a9cbab1735 release 2015.04.03 2015-04-03 10:22:25 +02:00
Sergey M․ a3c7019e06 [YoutubeDL] Check for `get_ca_certs` availability
`get_ca_certs` is not available in python <3.4
2015-04-02 22:50:10 +06:00
Sergey M․ 2ec8e04cac [miomio] Fix alphabetic order 2015-04-02 22:34:08 +06:00
Sergey M․ e03bfb30ce [miomio] Rename extractor 2015-04-02 22:33:30 +06:00
Sergey M․ f5b669113f [miomio] Simplify and fix python 2.6 issue 2015-04-02 22:32:16 +06:00
Sergey M․ d08225edf4 Merge branch 'MiomioTv' of https://github.com/tiktok7/youtube-dl into tiktok7-MiomioTv 2015-04-02 21:12:47 +06:00
Sergey M․ 8075d4f99d [playfm] Adapt to v2api (Closes #5344) 2015-04-02 20:26:05 +06:00
Jaime Marquínez Ferrándiz 1a944d8a2a Print a warning if no ssl certificates are loaded 2015-04-02 14:09:55 +02:00
Sergey M․ 55cde6ef3c [varzesh3] Simplify 2015-04-01 22:02:55 +06:00
Sergey M․ 69c3af567d Merge branch 'varzesh3' of https://github.com/mtp1376/youtube-dl into mtp1376-varzesh3 2015-04-01 20:25:46 +06:00
Sergey M․ ce3bfe5d57 Merge branch 'fix_douyu' of https://github.com/yan12125/youtube-dl 2015-04-01 19:54:00 +06:00
Sergey M․ 2a0c2ca2b8 [dailymotion] Fix ff cookie and use it for embed page (Closes #5330) 2015-03-31 20:55:21 +06:00
Sergey M․ c89fbfb385 [nbc] Remove redundant note
This is already supposed by `only_matching`
2015-03-31 20:14:37 +06:00
Sergey M․ facecb84a1 [generic] Add working NBC Sports vplayer test 2015-03-31 20:11:14 +06:00
Yen Chi Hsuan e15307a612 [NBCSports/Yahoo] Comment out some MD5 checksums
They seems to change constantly
2015-03-31 13:13:29 +08:00
Yen Chi Hsuan 5cbb2699ee [NBCSports] Add a test case for extended _VALID_URL 2015-03-31 03:38:45 +08:00
Yen Chi Hsuan a2edf2e7ff [NBC/ThePlatform/Generic] Add a generic detector for NBCSportsVPlayer and enhance error detection in ThePlatformIE 2015-03-31 03:36:09 +08:00
Yen Chi Hsuan 1d31e7a2fc [NBCSports] Move imports alphabetically 2015-03-31 02:51:11 +08:00
Yen Chi Hsuan a2a4d5fa31 [Yahoo/NBCSports] Generalize NBC sports info extractor 2015-03-31 02:47:18 +08:00
Yen Chi Hsuan a28ccbabc6 [Yahoo/NBCSports] Fix #5226 2015-03-31 02:21:27 +08:00
Naglis Jonaitis edd7344820 [phoenix] Extend _VALID_URL (#5322) 2015-03-30 18:16:51 +03:00
Sergey M․ c808ef81bb [soundcloud:set:user] Support mobile URLs (Closes #5323) 2015-03-30 21:03:38 +06:00
Sergey M․ 87270c8416 [dumpert] Simplify and fix python 3.2 2015-03-30 20:11:51 +06:00
Sergey M․ ebc2f7a2db Merge branch 'dumpert' of https://github.com/jorams/youtube-dl into jorams-dumpert 2015-03-30 19:47:11 +06:00
Sergey M․ 7700207ec7 [pornhub] Fix comment count extraction (Closes #5320) 2015-03-30 19:41:04 +06:00
Joram Schrijver 4d5d14f5cf [Dumpert] Add new extractor
Add support for the Dutch video site Dumpert. http://www.dumpert.nl/
2015-03-29 23:41:06 +02:00
Yen Chi Hsuan 9b4774b21b [Xuite] Fix extraction on python 3.2
base64.b64decode() accept only binary types in Python 3.2
2015-03-29 20:51:33 +08:00
Yen Chi Hsuan 2ddf083588 [douyutv] Simplify usage of isinstance 2015-03-29 18:17:48 +08:00
Yen Chi Hsuan 8343a03357 [douyutv] Fix extractor and improve error handling 2015-03-29 14:26:28 +08:00
Naglis Jonaitis ad320e9b83 [generic] Add support for 5min embeds (#5310) 2015-03-29 04:57:37 +03:00
Philipp Hagemeister ecb750a446 [cnn] Match more URLs 2015-03-28 23:39:41 +01:00
Philipp Hagemeister 5f88e02818 [ultimedia] PEP8 2015-03-28 23:35:55 +01:00
Sergey M․ 5a3b315b5f [dhm] Improve _VALID_URL and add test 2015-03-28 23:55:15 +06:00
Sergey M․ af8c93086c [dhm] Simplify 2015-03-28 22:30:13 +06:00
Sergey M․ 79fd11ab8e Merge branch 'dhm' of https://github.com/ossi96/youtube-dl into ossi96-dhm 2015-03-28 22:09:05 +06:00
Jaime Marquínez Ferrándiz cb88671e37 [nbc] Recognize https urls (fixes #5300) 2015-03-28 14:18:11 +01:00
Oskar Jauch ff79552f13 [DHM] Add extractor description 2015-03-28 10:42:35 +01:00
Oskar Jauch 643fe72717 [DHM] Add new extractor 2015-03-28 10:38:52 +01:00
Philipp Hagemeister 4747e2183a release 2015.03.28 2015-03-28 08:12:05 +01:00
Philipp Hagemeister c59e701e35 Default to continuedl=True
We already do this in the CLI interface, so it should be just fine.
2015-03-28 08:11:39 +01:00
Jaime Marquínez Ferrándiz 70a1165b32 Don't use bare 'except:'
They catch any exception, including KeyboardInterrupt, we don't want to catch it.
2015-03-27 13:02:20 +01:00
Naglis Jonaitis af14000215 [eroprofile] Add login support (#5269) 2015-03-26 23:24:28 +02:00
Sergey M․ 998e6cdba0 [vimeo] Capture and output error message (#5294) 2015-03-27 03:05:08 +06:00
Mohammad Teimori Pabandi 2315fb5e5f unicde :( 2015-03-26 23:53:57 +04:30
Jaime Marquínez Ferrándiz 157e9e5aa5 [youtube:watchlater] Remove unused properties and fix tests 2015-03-26 20:03:31 +01:00
Jaime Marquínez Ferrándiz c496ec0848 [vessel] Fix pep8 issue 2015-03-26 19:51:40 +01:00
Sergey M․ 31c4809827 [safari] Improve and simplify 2015-03-26 23:57:46 +06:00
Sergey M․ ac0df2350a Merge branch 'master' of https://github.com/zx8/youtube-dl into zx8-master 2015-03-26 23:57:13 +06:00
Naglis Jonaitis 223b27f46c [vessel] Add new extractor (Closes #5275) 2015-03-26 19:48:22 +02:00
Naglis Jonaitis 425142be60 [slideshare] Fix extraction (#5279) 2015-03-26 17:47:25 +02:00
Sergey M․ 7e17ec8c71 [youtube] Clarify some IE_NAMEs 2015-03-26 21:42:28 +06:00
Sergey M․ 448830ce7b [youtube:watchlater] Extract watchlater as playlist (Closes #5280) 2015-03-26 21:41:09 +06:00
Mohammad Teimori Pabandi 8896b614a9 removing unicode literal because it is imported :)) 2015-03-26 20:06:50 +04:30
Mohammad Teimori Pabandi a7fce980ad removed one of tests that made problem with testing server 2015-03-26 19:47:34 +04:30
Naglis Jonaitis 91757b0f37 [utils] Escape all HTML entities written in hexadecimal form 2015-03-26 17:15:27 +02:00
Naglis Jonaitis fbfcc2972b [teamcoco] Fix extraction 2015-03-26 16:13:53 +02:00
Mohammad Teimori Pabandi db40364b87 [Varzesh3] Add new extractor 2015-03-26 18:17:21 +04:30
Sergey M․ ae67d082fe [22tracks] Improve and simplify 2015-03-25 22:26:02 +06:00
Amish Bhadeshia 8f76df7f37 Updated init to add 22tracks 2015-03-25 21:11:31 +06:00
Amish Bhadeshia 5c19d18cbf [22Tracks] Add new extractor
Conflicts:
	youtube_dl/extractor/__init__.py
2015-03-25 21:10:54 +06:00
Sergey M․ 838b93405b [redtube] Fix test 2015-03-25 20:09:01 +06:00
Sergey M․ 2676caf344 [redtube] Capture and output removed video message (#5281) 2015-03-25 20:08:35 +06:00
testbonn 17941321ab Clean up of --help output
For consistency and readability
2015-03-25 11:02:55 +01:00
Philipp Hagemeister 48c971e073 release 2015.03.24 2015-03-24 16:39:53 +01:00
Philipp Hagemeister f5e2efbbf0 [options] Handle special characters in argv (Fixes #5157) 2015-03-24 16:39:46 +01:00
tiktok 5d1f0e607b [MiomioTv] updated based on feedback to merge request:
1) added comment to explain extra xml link download
    2) changed {} entries to {0}, {1} etc
    3) removed redundant language header (the others are required)
    4) checked out the old version of the supported sites md (the change was
    not required)
2015-03-23 23:16:50 +01:00
Sergey M․ b0872c19ea [npo] Skip broken URL links (Closes #5266) 2015-03-23 22:15:01 +06:00
Sergey M․ 9f790b9901 [mlb] Improve _VALID_URL (Closes #5260) 2015-03-23 21:23:57 +06:00
tiktok c41a2ec4af [MiomioTv] Add new extractor 2015-03-23 01:42:17 +01:00
Roman Le Négrate 575dad3c98 [pornovoisines] Add extractor 2015-03-22 20:27:45 +01:00
zx8 32d687f55e [safari] Add safaribooksonline extractor 2015-03-22 18:04:50 +00:00
Jaime Marquínez Ferrándiz 93f787070f [twitch] Only match digits for the video id
Urls can also contain contain a query (for example a timestamp '?t=foo')
2015-03-22 15:39:35 +01:00
Jaime Marquínez Ferrándiz 336d19044c [lybsyn] pep8: add space around operator 2015-03-22 11:03:52 +01:00
Sergey M․ 1a4123de04 [comedycentral] Remove unused import 2015-03-22 08:23:38 +06:00
Sergey M․ cf2e2eb1c0 [comedycentral] Drop thedailyshow podcast extractor
Generic extractor is just fine for Libsyn embeds
2015-03-22 08:23:20 +06:00
Sergey M․ 2051acdeb2 [extractor/generic] Add test for Libsyn embed 2015-03-22 08:20:27 +06:00
Sergey M․ cefdf970cc [extractor/generic] Support Libsyn embeds 2015-03-22 08:18:13 +06:00
Sergey M․ a1d0aa7b88 [libsyn] Fix extractor alphabetic order 2015-03-22 08:11:47 +06:00
Sergey M․ 49aeedb8cb [libsyn] Improve and simplify 2015-03-22 08:11:10 +06:00
Sergey M․ ef249a2cd7 Merge branch 'the-daily-show-podcast' of https://github.com/fstirlitz/youtube-dl into fstirlitz-the-daily-show-podcast 2015-03-22 07:44:28 +06:00
Sergey M․ a09141548a [nrk:playlist] Relax video id regex and improve _VALID_URL 2015-03-21 20:42:48 +06:00
Jaime Marquínez Ferrándiz c9450c7ab1 [nrk:playlist] Restrict _VALID_URL
It would also match /videos/PS... urls
2015-03-21 14:00:37 +01:00
Sergey M․ faa1b5c292 [nrk:playlist] Add extractor (Closes #5245) 2015-03-21 18:22:08 +06:00
Sergey M․ 393d9fc6d2 [nrk] Extract duration 2015-03-21 18:21:19 +06:00
Sergey M․ 4e6a228689 [nrk] Adapt to new URL format 2015-03-21 18:20:49 +06:00
Jaime Marquínez Ferrándiz 179d6678b1 Remove the 'stitle' field
A warning has been printed for more than 2 years (since 97cd3afc75)
2015-03-21 12:34:44 +01:00
Jaime Marquínez Ferrándiz 85698c5086 [crunchyroll] Remove unused class 2015-03-21 12:18:33 +01:00
Sergey M․ 1887ecd4d6 [twitch] Fix login 2015-03-20 21:45:09 +06:00
Sergey M․ 1c9a1457fc [niconico] Add nm video test 2015-03-20 20:53:14 +06:00
Sergey M․ 038b0eb1da Merge branch 'niconico_nm' of https://github.com/ndac-todoroki/youtube-dl into ndac-todoroki-niconico_nm 2015-03-20 20:52:56 +06:00
Naglis Jonaitis 2684871bc1 [vine] Fix formats extraction (Closes #5239) 2015-03-20 01:50:36 +02:00
Naglis Jonaitis ccf3960eec [nytimes] Improve _VALID_URL (Fixes #5238) 2015-03-19 20:55:05 +02:00
Naglis Jonaitis eecc0685c9 [videomega] Fix extraction and update test (Fixes #5235) 2015-03-19 19:38:03 +02:00
Sergey M․ 2ed849eccf Merge branch 'master' of github.com:rg3/youtube-dl 2015-03-19 21:27:38 +06:00
Sergey M․ 3378d67a18 [generic] Add support for nytimes embeds (Closes #5234) 2015-03-19 21:26:57 +06:00
Sergey M․ f3c0c667a6 [nytimes] Modernize 2015-03-19 21:23:52 +06:00
Sergey M․ 0ae8bbac2d [nytimes] Support embed URL 2015-03-19 21:17:04 +06:00
Philipp Hagemeister cbc3cfcab4 release 2015.03.18 2015-03-18 22:02:39 +01:00
Sergey M․ b30ef07c6c [ultimedia] Handle youtube embeds 2015-03-19 01:06:39 +06:00
Sergey M․ 73900846b1 [ultimedia] Capture and output unavailable video message 2015-03-19 00:53:26 +06:00
Sergey M․ d1dc7e3991 [ultimedia] Fix alphabetic order 2015-03-18 23:11:48 +06:00
Sergey M․ 3073a6d5e9 [ultimedia] Add extractor
Sponsored by thankyoumotion.com
2015-03-18 23:08:18 +06:00
Roman Le Négrate aae53774f2 [mixcloud] Try preview server first, then further numbers 2015-03-18 17:08:22 +01:00
Jaime Marquínez Ferrándiz 7a757b7194 [mixcloud] Fix extraction of some metadata
The second test had some wrong info.
I couldn't find the timestamp, so I have removed it.
2015-03-18 17:08:19 +01:00
Roman Le Négrate fa8ce26904 [mixcloud] Fix extraction like-count 2015-03-18 16:30:29 +01:00
Sergey M․ 2c2c06e359 [krasview] Fix extraction (Closes #5228) 2015-03-18 20:28:00 +06:00
Todoroki ee580538fa fix nm video DL issue when logged in 2015-03-18 22:24:17 +09:00
Todoroki c3c5c31517 fix nm video DL issue when logged in 2015-03-18 22:19:55 +09:00
Sergey M․ ed9a25dd61 [generic] Generalize redirect regex 2015-03-18 00:05:40 +06:00
felix 9ef4f12b53 testcases for libsyn and The Daily Show Podcast extractors 2015-03-17 18:54:36 +01:00
Sergey M․ 84f8101606 [generic] Follow redirects specified by `Refresh` HTTP header 2015-03-17 23:51:40 +06:00
Sergey M․ b1337948eb [grooveshark] Fix extraction 2015-03-17 23:13:43 +06:00
Sergey M․ 2ca1c5aa9f [douyutv] Improve and extract all formats 2015-03-17 22:27:33 +06:00
Sergey M․ 674fb0fcc5 Merge branch 'douyutv' of https://github.com/bonfy/youtube-dl into bonfy-douyutv 2015-03-17 21:41:25 +06:00
Sergey M․ cd459b1d49 [sohu] Fix test's note info 2015-03-17 21:39:31 +06:00
Sergey M․ 92a4793b3c [utils] Place sanitize url function near other sanitizing functions 2015-03-17 21:34:22 +06:00
Sergey M․ dc03a42537 Merge branch 'sohu_fix' of https://github.com/yan12125/youtube-dl into yan12125-sohu_fix 2015-03-17 21:18:36 +06:00
Sergey M․ 219da6bb68 [megavideoeu] Remove extractor 2015-03-17 21:13:42 +06:00
Sergey M․ 0499cd866e [primesharetv] Clean up 2015-03-17 21:06:38 +06:00
Jeff Buchbinder 13047f4135 [Primesharetv] Handle file not existing properly. 2015-03-17 20:33:32 +06:00
Jeff Buchbinder af69cab21d [Primesharetv] Add public domain example video 2015-03-17 20:33:24 +06:00
Jeff Buchbinder d41a3fa1b4 [Primesharetv] Add primeshare.tv extractor, still need test data 2015-03-17 20:33:16 +06:00
Jeff Buchbinder 733be371af Add megavideoz.eu support. 2015-03-17 20:33:03 +06:00
Sergey M․ 576904bce6 [letv] Clarify download message 2015-03-17 20:01:31 +06:00
Sergey M. cf47794f09 Merge pull request #5116 from yan12125/letv_fix
[Letv] Fix test_Letv and test_Letv_1 failures in python 3
2015-03-17 19:58:34 +06:00
Sergey M․ c06a9f8730 [arte+7] Check formats (Closes #5224) 2015-03-17 19:42:50 +06:00
felix 2e90dff2c2 The Daily Show Podcast support 2015-03-16 20:05:02 +01:00
Jaime Marquínez Ferrándiz b68eedba23 [rtve.es:infantil] Minor fixes (closes #5214) 2015-03-15 22:18:41 +01:00
Eduardo Ferro d5b559393b [rtve] Add new extractor for rtve infantil 2015-03-15 22:14:36 +01:00
Philipp Hagemeister 1de4ac1385 release 2015.03.15 2015-03-15 19:38:50 +01:00
Sergey M․ 39aa42ffbb [ard] Capture and output time restricted videos (Closes #5213) 2015-03-16 00:21:38 +06:00
Sergey M․ ec1b9577ba [cloudy] Fix key extraction (Closes #5211) 2015-03-15 22:42:13 +06:00
Sergey M. 3b4444f99a Merge pull request #5208 from admire93/master
Fix mistyped docstring indent
2015-03-15 17:20:50 +06:00
Kang Hyojun 613b2d9dc6 Fix mistyped docstring indent 2015-03-15 20:18:23 +09:00
Sergey M․ 8f4cc22455 [aftenposten] Adapt to new URL format 2015-03-15 10:08:14 +06:00
Jaime Marquínez Ferrándiz 88cf6fb368 [metadatafromtitle] Some improvements and cleanup
* Remove the 'songtitle' field, 'title' can be used instead.
* Remove newlines in the help text, for consistency with other options.
* Add 'from __future__ import unicode_literals'.
* Call '__init__' from the parent class.
* Add test for the format_to_regex method
2015-03-14 20:06:33 +01:00
phiresky e7db87f700 Add metadata from title parser
(Closes #5125)
2015-03-14 19:46:22 +01:00
Yen Chi Hsuan 2cb434e53e [Sohu] Fix title extraction 2015-03-15 01:05:01 +08:00
Yen Chi Hsuan cd65491c30 [Sohu] Add a multiplart video test case 2015-03-15 00:59:49 +08:00
Jaime Marquínez Ferrándiz 082b1155a3 [livestream] Extract all videos in events (fixes #5198)
The webpage only contains the most recent ones, but if you scroll down more will appear.
2015-03-14 12:06:01 +01:00
Jaime Marquínez Ferrándiz 9202b1b787 [eighttracks] Remove unused import 2015-03-14 12:04:49 +01:00
Sergey M․ a7e01c438d [8tracks] Modernize 2015-03-14 15:55:21 +06:00
Sergey M․ 05be67e77d [8tracks] Improve extraction 2015-03-14 15:54:23 +06:00
Sergey M․ 85741b9986 [8tracks] Use predefined avg duration when duration is negative (Closes #5200) 2015-03-14 15:52:06 +06:00
Mamay Alexander 29171bc2d2 [yandexmusic] Site mirrors 2015-03-14 13:56:04 +06:00
Sergey M․ 7be5a62ed7 [viewster] Improve extraction 2015-03-14 03:18:04 +06:00
Sergey M․ 3647136f24 [viewster] Add extractor 2015-03-14 02:12:11 +06:00
Sergey M․ 13598940e3 [kanalplay] Fix test 2015-03-14 01:27:21 +06:00
Sergey M․ bba3fc7960 [beatenpro] Fix tests 2015-03-13 22:13:50 +06:00
Sergey M․ fcd877013e [beatenpro] Simplify 2015-03-13 22:11:56 +06:00
Sergey M․ ba1d4c0488 [beatenpro] Improve display_id 2015-03-13 22:03:58 +06:00
Sergey M․ 517bcca299 [beatenpro] Simplify and improve 2015-03-13 22:01:15 +06:00
Sergey M․ 1b53778175 [beatenpro] Use generic format sort 2015-03-13 21:51:49 +06:00
Sergey M․ b7a0304d92 Merge branch 'beatport-pro' of https://github.com/djpohly/youtube-dl into djpohly-beatport-pro 2015-03-13 21:47:01 +06:00
Sergey M․ 545315a985 [nrk] Use generic subtitles timecode formatter 2015-03-13 21:40:34 +06:00
Sergey M․ 3f4327520c [kanalplay] Extract subtitles 2015-03-13 21:39:29 +06:00
Sergey M․ 4a34f69ea6 [extractor/common] Add subtitles timecode formatter 2015-03-13 21:38:28 +06:00