jon1scr
/
yt-dlc
forked from minhngoc25a/yt-dlc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,946 Commits 3 Branches 0 Tags 30 MiB
Commit Graph

5992 Commits

Author SHA1 Message Date
remitamine 75b399f455 [nowness] fix _VALID_URL regex 2015-09-05 16:53:17 +01:00
felix 12439dd5ec [generic] Capture <audio> tags in addition to <video> tags 2015-09-05 21:53:10 +06:00
remitamine c23c3d7d7d [nowness] fix video extraction and add support serie and playlist extraction (fixes #6720) 2015-09-05 16:38:05 +01:00
Yen Chi Hsuan 9dd73ef4a4 [dcn] PEP8 2015-09-05 15:38:05 +08:00
Yen Chi Hsuan 08354db47b [vlive] PEP8 2015-09-05 15:25:19 +08:00
Yen Chi Hsuan 027eb5a6b0 Merge branch 'vlive' of https://github.com/ping/youtube-dl into ping-vlive 2015-09-05 15:24:09 +08:00
Jaime Marquínez Ferrándiz c482b3c69a [ruutu] Update test url 2015-09-04 21:11:29 +02:00
Sergey M․ 22889ab175 [ruutu] Fix extraction (Closes #6759) 2015-09-05 00:01:40 +06:00
Marco Ferragina 26c61e0809 Added ec extension to nowvideo extractor 2015-09-04 12:59:13 +02:00
Jaime Marquínez Ferrándiz 725d1c58aa [crunchyroll] Extract width and height (closes #6749) 2015-09-03 13:15:02 +02:00
Sergey M․ e8dcfa3d69 [ok] Sort formats 2015-09-02 22:09:33 +06:00
Sergey M․ 88720ed09b [ok] Add support for youtube embeds 2015-09-02 22:08:50 +06:00
Sergey M․ 1e804244d0 [ok] Improve player regex 2015-09-02 21:38:56 +06:00
Sergey M․ 198492bbf0 [ok] Extract correct data-options (Closes #6726) 2015-09-02 21:36:22 +06:00
Jaime Marquínez Ferrándiz 080997b808 [rtve] Fix extraction (fixes #6723) 
Adding the 'Referer' header to the png request is enough.
 2015-09-01 20:30:58 +02:00
Sergey M․ 77306e8b97 [francetv] Update tests (2) 2015-09-01 22:42:43 +06:00
Sergey M․ 6917d2a2f0 [francetv] Update tests 2015-09-01 22:39:26 +06:00
Sergey M․ 36c15522c1 [francetv] Use subtitle when present (Closes #6715) 2015-09-01 22:37:42 +06:00
Sergey M․ cd5d75427e [youku] Fix videopassword test 2015-09-01 22:28:03 +06:00
Sergey M․ 5ddc127da6 [youku] Simplify (Closes #6717) 2015-09-01 22:26:17 +06:00
PSJay cb3d2eb9e9 Fix coding styple in YouKuIE. 2015-09-01 22:25:03 +06:00
PSJay 33eae08f04 Support video-password on Youku. 2015-09-01 22:24:57 +06:00
Jaime Marquínez Ferrándiz aa3f98677d [dumpert] Support 'embed/' urls (fixes #6712) 2015-09-01 18:13:33 +02:00
Sergey M․ fffccaaf41 [globo] Fix extraction and make more robust (Closes #6728) 2015-09-01 20:41:52 +06:00
Yen Chi Hsuan cdc8d0c373 [odnoklassniki] Fix extraction and extend _VALID_URL (closes #6726) 2015-09-01 16:34:05 +08:00
ping d14f0c45fc [vlive] Add info about www. to m. redirects for mobile 2015-09-01 11:11:14 +08:00
Sergey M․ 39955b0451 [fc2] Fix refer 2015-08-31 21:12:21 +06:00
Sergey M․ 52dfb7ffe2 [fc2] Add test for #3171 2015-08-31 21:05:37 +06:00
Sergey M․ 93462856e1 [fc2] Relax _VALID_URL (Closes #3171) 2015-08-31 21:05:23 +06:00
ping 615f155a3a [vlive] Fixes for review 2015-08-31 12:46:28 +08:00
Sergey M․ 8875b3d572 [imgut:album] Add extractor (Closes #6711) 2015-08-30 19:03:21 +06:00
Sergey M․ aabc2be693 [youtube] Simplify and extract more metadata from url_encoded_fmt_stream_map (Closes #5993) 2015-08-30 08:07:07 +06:00
Anssi Hannula c9afb51cea [youtube] Fix missing format details for 60fps DASH formats 
60fps DASH formats do not appear in the DASH manifest, but the non-DASH
video info page does contain additional parameters for DASH formats that
we can parse.

Use those when they exist.

This fixes "bestvideo" not selecting 60fps formats over similar 30fps
formats just because the file size is unknown.
 2015-08-30 08:05:16 +06:00
Yen Chi Hsuan c0a656876c [abc] Use int_or_none 2015-08-30 01:11:56 +08:00
Yen Chi Hsuan 17a647630b [abc] Support YouTube embeds (fixes #6595) 2015-08-30 01:08:55 +08:00
Sergey M․ c88e118b3c [nowtv] Fix display_id (Closes #6702) 2015-08-29 22:41:49 +06:00
Sergey M․ ae6a802106 [kaltura] Fix _VALID_URL formatting 2015-08-29 20:26:51 +06:00
Sergey M․ b184f94413 [kaltura] Clarify html5 player comment 2015-08-29 20:23:06 +06:00
Sergey M․ ee3ec091f4 [kaltura] Strictify _VALID_URL 2015-08-29 20:21:59 +06:00
sourcerect ef49b59053 [kaltura] add html5 player urls 2015-08-29 19:29:07 +06:00
Sergey M․ 1f8125805e [generic] Add test for screenwavemedia embed 2015-08-29 19:12:38 +06:00
Sergey M․ efd712c69b [generic] Use screenwavemedia embed pattern 2015-08-29 19:07:31 +06:00
Sergey M․ 109a4156e1 [cinemassacre] Use screenwavemedia embed pattern 2015-08-29 19:06:55 +06:00
Sergey M․ 678d33295b [screenwavemedia] Improve _VALID_URL 2015-08-29 19:05:11 +06:00
Sergey M․ 5e58956d0a [screenwavemedia] Add EMBED_PATTERN 2015-08-29 19:00:38 +06:00
felix e276fd2cb3 [screenwavemedia] warn when falling back to a hardcoded list of streams 2015-08-29 18:38:41 +06:00
felix 9b22cb10c4 [screenwavemedia] use the true JS value instead of a comment 2015-08-29 18:38:34 +06:00
felix 8ca31a0e05 [generic] Look for ScreenwaveMedia embeds 2015-08-29 18:38:23 +06:00
Sergey M․ 20149a5da1 [mtvservices] Fix title extraction under python 2 2015-08-28 22:10:49 +06:00
Sergey M․ 054d43bb11 [mtvservices] Catch more georestriction errors 2015-08-28 21:45:29 +06:00
Sergey M․ 65488b820c [mtvde] Add support for news 2015-08-28 21:41:54 +06:00
Sergey M․ c3c9f87954 [mtvde] Add test for mediagen URL without query 2015-08-28 21:31:38 +06:00
Sergey M․ 56f447be9f [mtvservices] Fix mediagen URL generation 2015-08-28 21:27:36 +06:00
Sergey M․ 79fa9db0da [mtvde] Simplify (Closes #6673) 2015-08-28 21:24:54 +06:00
Paul Hartmann 071c10137b [MTV] move German mtv site to new class 2015-08-28 21:23:00 +06:00
Sergey M․ 5307c33232 [foxnews] Clarify IE_DESC 2015-08-27 21:48:47 +06:00
Sergey M․ 1b660cce12 [foxnews] Simplify (Closes #6694) 2015-08-27 21:48:03 +06:00
nmrugg 8df8c278b6 Added matching test for FoxBusiness. 2015-08-27 21:41:16 +06:00
nmrugg d7e8264517 Make FoxBusiness work. 2015-08-27 21:41:08 +06:00
Sergey M․ f11c316347 [shared] Add filesize to test 2015-08-26 22:06:10 +06:00
Sergey M․ f62e02c24f [shared] Add test for vivo 2015-08-26 22:05:45 +06:00
Sergey M․ 70113c38c9 [shared] Clarify IE_DESC 2015-08-26 22:04:39 +06:00
Sergey M․ 3d8132f5e2 [shared] Extend _VALID_URL to support vivo.sx (Closes #6681) 2015-08-26 22:03:58 +06:00
Sergey M․ 39affb5aa4 [crunchyroll] Fix typo 2015-08-26 21:27:57 +06:00
Sergey M․ a882c5f474 [udemy] Use raise_login_required 2015-08-26 21:27:07 +06:00
Sergey M․ 61a7ff1622 [tubitv] Use raise_login_required 2015-08-26 21:26:47 +06:00
Sergey M․ 42e7373bd3 [smotri] Use raise_login_required 2015-08-26 21:26:35 +06:00
Sergey M․ e269d3ae7d [safari] Use raise_login_required 2015-08-26 21:26:24 +06:00
Sergey M․ e7ddaef5bd [pluralsight] Use raise_login_required 2015-08-26 21:26:09 +06:00
Sergey M․ 62984e4584 [lynda] Use raise_login_required 2015-08-26 21:25:53 +06:00
Sergey M․ 3c53455d15 [eroprofile] Use raise_login_required 2015-08-26 21:25:37 +06:00
Sergey M․ bbb43a39fd [crunchyroll] Use raise_login_required 2015-08-26 21:25:04 +06:00
Sergey M․ 43e7d3c945 [extractor/common] Add raise_login_required 2015-08-26 21:24:47 +06:00
Sergey M․ 2f72e83bbd [crunchyroll] Detect required login (#6677) 2015-08-26 20:47:57 +06:00
Jaime Marquínez Ferrándiz 4bc8eec4eb [youtube] Adapt player version regex to handle urls ending in '/html5player-new.js' 
It was always extracting 'new' as the version, breaking the cache system.
 2015-08-26 15:21:55 +02:00
Sergey M․ baf510bf8c [yandexmusic:playlist] Handle playlists with more than 150 tracks (Closes #6666) 2015-08-26 00:11:15 +06:00
Sergey M․ 6d53cdd6ce [yandexmusic] Skip removed tracks (#6666) 2015-08-25 23:29:02 +06:00
Sergey M․ ebbf078c7d [krasview] Skip download for test 2015-08-25 21:19:21 +06:00
Sergey M․ 95e431e9ec [mailru] Skip tests 2015-08-25 21:08:38 +06:00
ping eba470f2f2 [vlive] Remove upload_date extraction & cleanup 2015-08-24 16:30:00 +08:00
Sergey M․ e4df2f98cc [yandexmusic:track] Eliminate base class 2015-08-24 00:36:54 +06:00
Sergey M․ e7c14660d3 [yandexmusic] Defer link resolve till actual download time to prevent link expiry (Closes #6650) 2015-08-24 00:36:24 +06:00
Sergey M․ 90076b6172 [spankwire] Preserve old uploader pattern 2015-08-23 22:33:26 +06:00
Sergey M․ 28b83495d8 [spankwire] Simplify 2015-08-23 22:32:44 +06:00
Sergey M․ 551c7837ac [spankwire] Simplify and properly format 2015-08-23 22:32:20 +06:00
clauderains 59e6acc757 [spankwire] Support new cdn video url format 2015-08-23 22:21:59 +06:00
clauderains 9990c960f2 [spankwire] Fixed uploader_id field extraction so that test case passes 2015-08-23 22:21:54 +06:00
Sergey M․ 2006a06eff [kontrtube] Fix extraction (Closes #6644) 2015-08-23 21:43:28 +06:00
Sergey M․ 2b6bda1ed8 [pluralsight] Do not yet rely on userMayViewClip 2015-08-23 11:21:56 +06:00
Sergey M․ 468083d2f5 [pluralsight] Remove unused const 2015-08-23 10:44:10 +06:00
Sergey M․ 483fc223bb [pluralsight] Add extractor (Closes #6090) 2015-08-23 10:42:34 +06:00
Sergey M․ 66ce97024d [soundcloud:user] Update tests 2015-08-22 06:30:00 +06:00
Jaime Marquínez Ferrándiz 8c97f81943 [common] Follow convention of using 'cls' in classmethods 2015-08-21 11:35:51 +02:00
Yen Chi Hsuan d7c1630570 [rtl2] Remove MD5 checksums 2015-08-21 13:21:21 +08:00
Yen Chi Hsuan 5e1a5ac8de [rtl2] Fix extraction for test_RTL2_1 2015-08-21 13:20:51 +08:00
Yen Chi Hsuan 9eb4ab6ad9 [rtl2] Remove an unused line 2015-08-21 13:04:25 +08:00
Yen Chi Hsuan 4932a817a0 [rtl2] Add skip_download for test 2015-08-21 13:00:08 +08:00
Sergey M․ 5d003e29b1 [rtp] Add skip_download for test 2015-08-21 08:56:05 +06:00
Sergey M․ dc95bd503e [folketinget] Add skip_download for test 2015-08-21 08:54:28 +06:00
Yen Chi Hsuan f738dd7b7c [common] Remove debugging codes 2015-08-21 01:43:22 +08:00
Yen Chi Hsuan c687ac745b [theplatform] Use subtitles from SMIL, too 2015-08-21 01:37:43 +08:00
Yen Chi Hsuan 912e0b7e46 [common] Add _merge_subtitles() 2015-08-21 01:37:07 +08:00
Yen Chi Hsuan 03bc7237ad [common] _parse_smil_subtitles: accept `lang` as the subtitle language 2015-08-20 23:18:58 +08:00
ping 061f62da54 [vlive] New extractor for vlive.tv 2015-08-20 12:56:11 +08:00
Yen Chi Hsuan dd565ac1ad [theplatform] Use _download_json 2015-08-20 03:07:04 +08:00
Sergey M․ 5cdefc4625 [extractor/common] Add more subtitle mime types for guess when ext is missing 2015-08-20 01:02:50 +06:00
Sergey M․ ce00af8767 [extractor/common] Add default subtitles lang 2015-08-20 00:56:17 +06:00
Yen Chi Hsuan 51047444aa Merge branch 'master' into HEAD 2015-08-20 01:56:08 +08:00
Yen Chi Hsuan aa6cd05ed8 [theplatform] Fix Python 2: declare coding 2015-08-20 01:47:55 +08:00
Yen Chi Hsuan dac14bf311 [nbc] Add MSNBCIE 2015-08-20 01:41:18 +08:00
Yen Chi Hsuan 05fe2594e4 [theplatform] Support URLs with 'guid=' 2015-08-20 01:38:39 +08:00
Yen Chi Hsuan 26e1c3514f [theplatform] Add ThePlatformFeedIE 2015-08-20 01:24:32 +08:00
Sergey M․ 22c83245c5 [mwave] Improve 2015-08-19 23:07:41 +06:00
ping 7900aede14 [mwave] New extractor for mwave.interest.me 2015-08-19 22:40:40 +06:00
Yen Chi Hsuan f877c6ae5a [theplatform] Use InfoExtractor._parse_smil_formats() 2015-08-19 23:11:25 +08:00
Sergey M․ ca681f7041 [videobam] Remove extractor 
videobam.com redirects to sendvid.com now
 2015-08-19 20:52:36 +06:00
Sergey M․ a01da8bbf8 [crunchyroll] Workaround fplive.net rtmp URLs (Closes #5881) 2015-08-18 23:02:57 +06:00
Sergey M․ 559f4c550f [playtvak] PEP 8 2015-08-18 20:27:58 +06:00
Sergey M․ 03c635a4b5 [twitch] Fix login (Closes #6599) 2015-08-18 20:26:45 +06:00
Sergey M․ 34a4cd0a34 [telecinco] Relax _VALID_URL (Closes #6601) 2015-08-18 20:02:56 +06:00
Philipp Hagemeister 3b9b32f404 [libsyn] Strip options from player URL 2015-08-18 13:02:41 +02:00
Sergey M․ 9c724a9802 [twitch:vod] Add test for #6585 2015-08-17 20:23:52 +06:00
Sergey M․ 7a6e8a1b17 [twitch] Make more robust 2015-08-17 20:20:04 +06:00
Sergey M․ 369c12e038 [twitch] Allow untitled videos (Closes #6585) 2015-08-17 20:16:43 +06:00
Philipp Hagemeister c00c7c0af0 [sportdeutschland] Fix extraction 2015-08-16 23:39:50 +02:00
Sergey M․ cbaed4bb5e [youtube] Expand _VALID_URL to support vid.plus 2015-08-17 02:04:13 +06:00
Sergey M․ f74a7348f6 [youtube:search_url] Fix extraction (Closes #6578) 2015-08-16 23:33:17 +06:00
Sergey M․ 8626b23e4e [screenwavemedia] Make more robust 2015-08-16 20:18:15 +06:00
Sergey M․ 0086874277 [playtvak] Use tuples 2015-08-16 19:59:03 +06:00
Sergey M․ 7fc18d9309 [screenwavemedia] Fix extraction (Closes #6575) 2015-08-16 19:53:14 +06:00
Sergey M․ 974f1a385a [playtvak] Improve description extraction and add test for metro 2015-08-16 17:22:13 +06:00
Sergey M․ 276c989772 [playtvak] Improve and simplify 2015-08-16 03:07:05 +06:00
Sergey M․ ea99110d24 Merge branch 'playtvak' of https://github.com/oskar456/youtube-dl into oskar456-playtvak 2015-08-16 01:06:38 +06:00
Ondřej Caletka 221a59fe6f [playtvak] Initial support for videos from Mafra group servers 
Support for videos in articles from idnes.cz, lidovky.cz, metro.cz, as
well as video and live streams from playtvak.cz

Signed-off-by: Ondřej Caletka <ondrej@caletka.cz>
 2015-08-15 20:59:40 +02:00
Sergey M․ 041bc3adc5 [youtube] Simplify two-factor authentication 2015-08-15 22:10:38 +06:00
Sergey M․ e64b756943 [extractor/common] Interactive TFA code input 2015-08-15 21:55:07 +06:00
Sergey M․ 201ea3ee8e [extractor/common] Improve _hidden_inputs 2015-08-15 21:52:22 +06:00
reddraggone9 9303ce3e69 [youtube] Fix two-factor authentication 2015-08-15 21:48:44 +06:00
Sergey M․ c576ef1e7c [shahid] Improve and simplify 2015-08-15 18:13:37 +06:00
Sergey M․ 11bed5827d Merge branch 'shahid' of https://github.com/remitamine/youtube-dl into remitamine-shahid 2015-08-15 16:32:06 +06:00
Sergey M․ 1d25e9d173 [extractor/__init__] Fix order 2015-08-15 16:00:24 +06:00
Sergey M․ 9c21f22923 [esri:video] Rename extractor 2015-08-15 15:59:35 +06:00
Sergey M․ 3aa697f993 [esri:video] Extract all formats and simplify 2015-08-15 15:58:56 +06:00
Sergey M․ 8b9848ac56 [extractor/common] Expand meta regex 2015-08-15 15:58:30 +06:00
Shaun Walbridge 8b8c1093b6 [EsriVideo] Add new extractor 
Add extractor for [videos.esri.com](https://videos.esri.com), a collection
of videos relating to GIS.
 2015-08-15 15:57:59 +06:00
Yen Chi Hsuan d0d6c097fc [moniker] Support embed- URLs (#6450) 2015-08-15 15:17:27 +08:00
Sergey M․ 41dbc50f9c [lynda] Capture and output login error (Closes #6556) 2015-08-14 22:07:02 +06:00
Sergey M․ 594f51b859 [indavideo] Remove unused import 2015-08-13 23:47:49 +06:00
Sergey M․ a34e19629c [indavideo] Relax _VALID_URL to match subdomains and add tests 2015-08-13 23:40:20 +06:00
Sergey M․ 3c12a027d4 [indavideo] Split in two extractors, extract all formats and fix timestamp 2015-08-13 23:25:47 +06:00
nyuszika7h cb28e03386 [indavideo] Add new extractor 
Closes #2147.
 2015-08-13 22:19:22 +06:00
Yen Chi Hsuan 28479149cc [theplatform] Fallback to hardcoded releaseUrl if not available 
Fixes #6546.

Not adding a test case as test_NBC has the same problem.
 2015-08-13 12:56:12 +08:00
Sergey M․ 237c03c8ea [dhm] Remove unused import 2015-08-13 01:19:23 +06:00
Sergey M․ e73c85cb23 [iqiyi] PEP 8 2015-08-13 01:18:49 +06:00
Sergey M․ b6b2711298 [tweakers] Remove unused imports 2015-08-13 01:17:15 +06:00
Sergey M․ 2c919adb74 [rtvnh] Check status code 2015-08-13 01:11:55 +06:00
Sergey M․ 60231c65b9 [rtvnh] Make SMIL not fatal 2015-08-13 01:02:50 +06:00
Sergey M․ f196047832 [rtvnh] Make thumbnail optional 2015-08-13 01:00:25 +06:00
Sergey M․ 240ca32e57 [rtvnh] Carry long lines 2015-08-13 01:00:05 +06:00
Sergey M. fa37c26c4d Merge pull request #6537 from ngld/rtvnhnl 
[rtvnhnl] Added new extractor
 2015-08-13 00:57:00 +06:00
ngld d7dbfc7cc1 Use native HLS implementation by default. 2015-08-12 20:51:28 +02:00
ngld d9ab5262b1 [rtvnh] Renamed rtvnhnl -> rtvnh 2015-08-12 20:26:13 +02:00
ngld fb124e3741 [rtvnhnl] Relax the thumbnail check 2015-08-12 20:21:32 +02:00
Sergey M. 479bf783d2 Merge pull request #6539 from ngld/fix-funnyordie 
[funnyordie] Handle protocol-relative URLs (fixes #6490)
 2015-08-12 23:23:35 +06:00
ngld f0f3a6c99d [rtvnhnl] Added new extractor 2015-08-12 18:07:27 +02:00
Sergey M․ f57b7835e2 [youtube] Update tests 2015-08-12 21:27:58 +06:00
ngld 1df3186e0e [funnyordie] Handle protocol-relative URLs (fixes #6490) 2015-08-12 16:01:47 +02:00
sceext 0a19d4ccd6 [iqiyi] update md5 salt (2015-08-10 Zombie) 2015-08-12 14:01:48 +08:00
Sergey M․ b1ac38fadc [tvplay] Add age limit to tests 2015-08-11 01:49:23 +06:00
Sergey M․ fb0d12c6cb [pbs] Add age limit to tests 2015-08-11 01:46:25 +06:00
Sergey M․ 34952f09e1 [youtube] Add age limit to tests 2015-08-11 01:24:53 +06:00
Sergey M․ 34a7de2970 [youtube] Skip download for multiple v= test 2015-08-11 01:22:06 +06:00
Sergey M. 0ff827419e Merge pull request #6518 from puckipedia/master 
[youtube] Use the first v= argument in the URL
 2015-08-11 01:18:50 +06:00
Sergey M․ b29440aee6 [vimeo:user] Do not match watchlater 2015-08-11 01:17:41 +06:00
Puck Meerburg 11b5605815 [youtube] Use the first v= argument in the URL 
This is according to how youtube handles multiple v= values in one URL.
Before this, it was possible to make a single URL show up differently
 on youtube itself, and if you downloaded/viewed it with youtube-dl/mpv
 2015-08-10 20:52:38 +02:00
Sergey M․ 844587669e [vimeo:watchlater] Fix extraction (Closes #3886) 2015-08-10 23:58:01 +06:00
Sergey M․ f6c3664d71 [vimeo] Fix login (Closes #6488) 2015-08-10 23:35:08 +06:00
Sergey M․ c5864a8ce6 [fc2] Fix python 2.6 (Closes #6512) 2015-08-10 21:38:58 +06:00
Sergey M․ 0791ac1b44 [extractor/generic] Clarify comment 2015-08-09 19:47:58 +06:00
Sergey M․ 1de5cd3ba5 [extractor/generic] Add test for xspf playlist 2015-08-09 19:47:08 +06:00
Sergey M․ 729accb482 [extractor/generic] Add support for xspf playlists 2015-08-09 19:43:42 +06:00
Sergey M․ 942acef594 [extractor/common] Extract _parse_xspf 2015-08-09 19:41:55 +06:00
Sergey M․ fb2f339fec [dhm] Use _extract_xspf_playlist 2015-08-09 19:21:25 +06:00
Sergey M․ 98044462b1 [extractor/common] Use playlist id as default title 2015-08-09 19:18:50 +06:00
Sergey M․ 0dcb318f62 [tweakers] Fix test 2015-08-09 19:15:20 +06:00
Sergey M․ f32143469f [tweakers] Use _extract_xspf_playlist 2015-08-09 19:15:00 +06:00
Sergey M․ 3a30508b94 [telegraaf] Add extractor (Closes #6492) 2015-08-09 19:11:23 +06:00
Sergey M․ e0b9d78fab [extractor/common] Clarify playlists can have description field 2015-08-09 19:09:50 +06:00
Sergey M․ 8d6765cf48 [extractor/generic] Add generic support for xspf playist extraction 2015-08-09 19:07:18 +06:00
Sergey M․ 12bb392a0f [vimeo] Fix password protected videos (Closes #6507) 2015-08-09 17:10:40 +06:00
Sergey M․ 08df685fe7 [videolectures] Fix _VALID_URL for test_no_duplicates to pass 2015-08-09 08:51:37 +06:00
Sergey M․ c8d1be772d [rutube] Add age_limit to test 2015-08-08 22:11:06 +06:00
Sergey M․ 887e9bc7b5 [ok] Update tests 2015-08-08 22:08:54 +06:00
Sergey M․ 9f2e7c2f34 [ok] Add age_limit to tests 2015-08-08 22:04:48 +06:00
Sergey M․ d7bb8884af [break] Add age_limit to test 2015-08-08 21:58:24 +06:00
Sergey M․ 464e792496 [vpro] Override npo IE_NAME 2015-08-08 21:51:21 +06:00
Sergey M․ 18c3281f9e [24video] Fix test 2015-08-08 21:43:20 +06:00
Sergey M․ b61b7787cb [91porn] Extract age limit 2015-08-08 21:30:57 +06:00
Sergey M․ b465083f45 [sexykarma] Fix test 2015-08-08 21:27:10 +06:00
remitamine 59e89e62d7 [shahid] add default fallbacks for extracting api vars 2015-08-08 12:59:10 +01:00
Sergey M. d5d7bdaeb5 Merge pull request #6428 from dstftw/improve-generic-smil-support 
Improve generic SMIL support
 2015-08-08 05:47:33 +06:00
Sergey M․ b2f82948ee [quickscope] Fix typo 2015-08-08 05:40:41 +06:00
Sergey M․ 428e4e4a85 [quickscope] Add extractor 2015-08-08 05:37:38 +06:00
Sergey M․ 1e83741c9a [periscope] Add support for running streams 2015-08-08 05:33:53 +06:00
Sergey M․ 621d6a9516 [periscope] Switch to API for broadcast data 2015-08-08 04:00:52 +06:00
Sergey M․ 3550821fb4 [periscope] Add extractor (Closes #5850, closes #6459) 2015-08-08 03:38:55 +06:00
Sergey M․ 5b0c40da24 [extractor/common] Expand meta regex 2015-08-08 03:36:29 +06:00
remitamine c29458f3ec [shahid] change the tests 2015-08-07 21:38:50 +01:00
Sergey M․ bf94d763ba [extractor/generic] Add test for #6485 2015-08-08 02:00:49 +06:00
Sergey M․ 8a37aa1517 [extractor/generic] Expand ooyala regex (Closes #6485) 2015-08-08 01:55:59 +06:00
Sergey M․ fd5d8270dc [clipfish] Fix extraction, minimize requests, get rid of drm hds, extract m3u8 and more metadata 2015-08-08 01:10:41 +06:00
Sergey M․ be612d9e0c Merge branch 'clipfish' of https://github.com/remitamine/youtube-dl into remitamine-clipfish 2015-08-08 00:21:42 +06:00
Sergey M․ 4a7434d0b0 [dcn] Simplify _VALID_URL 2015-08-08 00:19:40 +06:00
Sergey M․ f94639fadf [dcn] Improve 2015-08-08 00:06:03 +06:00
Sergey M․ 89faae660f Merge branch 'dcn' of https://github.com/remitamine/youtube-dl into remitamine-dcn 2015-08-07 23:29:33 +06:00
Sergey M․ 0f422256d6 [nowtv] Add .at test 2015-08-07 19:51:09 +06:00
Sergey M․ acc1adbe7a [nowtv] Add support for .ch TLD 2015-08-07 19:50:54 +06:00
Sergey M․ 8002ac9e0a [nowtv] Add support for .at TLD 2015-08-07 19:04:44 +06:00
remitamine 6d30cf04db [dcn] fix type and key errors 2015-08-07 10:01:18 +01:00
Sergey M․ 9663bd3abb [southpark:de] Enable non-ASCII redirect URL test 2015-08-07 01:27:07 +06:00
remitamine 3be3c622dc [shahid] generic errors handling and check with flake8 2015-08-06 19:37:45 +01:00
remitamine cd6b555e19 [dcn] add origin to api request and fix the test and check with flake8 2015-08-06 19:17:50 +01:00
Sergey M․ 4f34cdb0a8 [southpark:de] Skip test 2015-08-06 23:56:44 +06:00
Sergey M․ bd690a9f93 [southpark:de] Add test for non-ASCII in URLs 2015-08-06 22:01:31 +06:00
Sergey M․ c73cdd800f [xhamster] flake8 2015-08-05 23:08:55 +06:00
Sergey M․ f535ec8278 [xhamster] Remove unused import 2015-08-05 23:08:26 +06:00
Sergey M․ 238755752f [tudou] Extract player URL from the webpage 2015-08-05 23:07:52 +06:00
Delon c71a3195af [tudou] Fix extracion 2015-08-05 23:04:49 +06:00
Sergey M․ 54a9328b20 [generic] Expand jwplayer support 2015-08-05 21:19:52 +06:00
Sergey M․ 3e48522477 [xhamster] Fix uploader extraction 2015-08-05 20:41:40 +06:00
Sergey M․ 251a44b776 [xhamster] Fix thumbnail extraction 2015-08-05 20:36:37 +06:00
Sergey M․ be7a8379b4 [xhamster] Make more robust 2015-08-05 20:32:44 +06:00
Sergey M. defce60385 Merge pull request #6467 from vijayanandnandam/master 
fixing xhamster file extraction
 2015-08-05 20:21:19 +06:00
vijayanand nandam 354b4b8604 fixing xhamster file extraction 2015-08-05 19:37:59 +05:30
Sergey M․ 5b7dab2dd6 [lynda] Make login more robust 2015-08-05 20:06:48 +06:00
Sergey M․ 8a5601e42f [lynda] Fix login (Closes #6462) 2015-08-05 19:52:04 +06:00
Sergey M․ a346b1ff57 [bbc] Add support for vxp-playlist-data embeds (Closes #6453) 2015-08-04 20:44:22 +06:00
Niklas Haas e704f87f86 [twitch] Parse start_time from 't' (closes #6441) 
Eg. for VOD links like http://www.twitch.tv/gamesdonequick/v/9136645?t=14h29m15s
 2015-08-03 20:07:23 +02:00
Sergey M․ 8f5639afcb [pornhub] Improve video quality regex 2015-08-03 19:37:48 +06:00
Jaime Marquínez Ferrándiz 47a8b7c14a [mdr] Change XPath to make it work in python 2.6 (fixes #6443) 
The 'progressiveDownloadUrl' element is a direct child, so they should be equivalent.
 2015-08-03 12:00:08 +02:00
Sergey M. 2a04d2c799 Merge pull request #6439 from remitamine/facebook 
[facebook] extract uploader
 2015-08-03 05:43:01 +06:00
remitamine 67b8a28a2f [facebook] add uploader value to the tests 2015-08-03 00:09:21 +01:00
remitamine 51a575159a [facebook] extract uploader 2015-08-02 22:52:12 +01:00
Sergey M․ 524229a297 [pornhub] Improve 2015-08-03 02:41:17 +06:00
George Brighton 754e70cf3e [pornhub] Fix video url regular expression. 
PornHub seems to have subtly changed their JavaScript. Before, video URL strings were embedded directly in the video's `flashvars_*` object, but they are now assigned to variables of the form `player_quality_*`, which are then added to this object later under the relevant quality key.
 2015-08-03 02:35:06 +06:00
Jaime Marquínez Ferrándiz 25a4c5a9ed [dailymotion:playlist] Use an iterator for the entries 
So that using '--playlist-end' only downloads the required pages (reported in #2175).
 2015-08-02 15:19:57 +02:00
Jaime Marquínez Ferrándiz 5c45bbe57b [nowtv] Remove unused import 2015-08-02 15:19:30 +02:00
Sergey M․ d41d04c0f5 [videolectures] Fix _VALID_URL 2015-08-02 06:35:35 +06:00
Sergey M․ e422d7f4f7 [nowtv] Expand _VALID_URL 2015-08-02 04:26:59 +06:00
Sergey M․ cdc682d5a4 [nowtv] Fix extraction (Closes #6357) 2015-08-02 04:21:16 +06:00
Jaime Marquínez Ferrándiz 9cc93c64aa [screenwavemedia] Use the IP for the videoserver (fixes #6397) 
For http://cinemassacre.com/2015/07/28/avgn-seaman-for-dreamcast/ the other server returns a 403 error.
 2015-08-01 22:17:19 +02:00
remitamine fa7a1cc5ef [screenwavemedia] fix info extraction (fixes #6270) 
Closes #6330.
 2015-08-01 22:13:10 +02:00
Sergey M․ 17712eeb19 [extractor/common] Extract namespace parse routine 2015-08-02 01:31:17 +06:00
Sergey M․ 41c3a5a7be [extractor/common] Fix python 3 2015-08-02 01:20:49 +06:00
Sergey M․ 8765222d22 [extractor/generic] Add generic SMIL tests 2015-08-02 01:16:21 +06:00
Sergey M․ e5e8d20a3a [extractor/generic] Improve generic SMIL detection 2015-08-02 01:13:59 +06:00
Sergey M․ a107193e4b [extractor/common] Extract f4m and m3u8 formats, subtitles and info 2015-08-02 01:13:21 +06:00
Sergey M․ 3f125c8c70 [nbcnews] Extend _VALID_URL 2015-08-01 21:43:33 +06:00
Jaime Marquínez Ferrándiz 525a87f58e [gdcvault] Fix typo: xml_decription_url -> xml_description_url 2015-08-01 11:40:34 +02:00
remitamine 44cae2fb2e [gdcvault] Add support for audio extraction (fixes #5784) 
Closes #6412.
 2015-08-01 11:39:50 +02:00
remitamine 30a453884e [viewster] use head request to extract api token 
Closes #6419.
 2015-08-01 11:06:26 +02:00
Sergey M․ 3b58d94f71 [vidme] Make uploader optional and add test 2015-08-01 04:03:52 +06:00
Sergey M. 8abb86fec4 Merge pull request #6421 from remitamine/vidme 
[vidme] extract the uploader
 2015-08-01 03:55:52 +06:00
Sergey M․ 16a089780e [soundcloud] Clean up _VALID_URLs 2015-08-01 03:50:03 +06:00
remitamine 09b6468d30 [vidme] extract the uploader 2015-07-31 21:28:59 +01:00
Sergey M․ 80fb6d4aa4 [soundcloud:user] Rework extractor (Closes #6399) 2015-07-31 00:54:26 +06:00
Jaime Marquínez Ferrándiz 1f04873517 [viewster] Use 'compat_urllib_parse_unquote' 2015-07-30 19:12:37 +02:00
remitamine 799207e838 [viewster] extract the api auth token 
Closes #6406.
 2015-07-30 12:55:48 +02:00
Jaime Marquínez Ferrándiz 34866b4836 Merge remote-tracking branch 'dstftw/multifeed-videos' (closes #6360) 2015-07-29 21:55:20 +02:00
Sergey M․ d12a1a47d5 [bbc] Improve work with mediaselection URLs 2015-07-30 00:55:06 +06:00
Sergey M․ 8d42e3501e Merge branch 'pr-fix_bbc_mediaselector' of https://github.com/atomicdryad/youtube-dl into atomicdryad-pr-fix_bbc_mediaselector 2015-07-29 23:55:40 +06:00
Sergey M․ 5e1eddb939 [youtube] Show info message for multifeed videos according to noplaylist option 2015-07-29 21:18:16 +06:00
Sergey M․ 000b6b5ae5 [youtube] Improve tags extraction and add test 2015-07-29 03:43:32 +06:00
Sergey M․ 864f24bd2c [extractor/common] Add _meta_regex and clarify tags field 2015-07-29 03:43:03 +06:00
Purdea Andrei 5316bf7487 Documented tags as a possible dict key 2015-07-28 18:30:42 +03:00
Purdea Andrei a6f774e901 [youtube]: tags key in info jason is now a list 2015-07-28 18:29:13 +03:00
Purdea Andrei f171bc8b59 [youtube] save keywords in info jason when --write-info-json is used 2015-07-28 18:14:06 +03:00
Sergey M․ d247a2c8bf [bbc] Fix regex 2015-07-28 02:06:27 +06:00
Sergey M․ 88ed52aec9 [bbc] Add support for direct bbc.co.uk embeds 2015-07-27 22:05:51 +06:00
fnord cb23bcba29 BBCIE: Fix missing .mp4 formats on news sites 
Prior to merge BBCNewsIE from pr #6026 was rewritten into BBCIE in 9afa177. Support was added for non-news
sites (/travel, /sports), however support for the news mediaselector was removed to support these sites.
This removed support for .mp4.

    pr #6026 ( news site, news mediaseletor : http://open.live.bbc.co.uk/mediaselector/4/mtis/stream/ )
    format code                                          extension  resolution note
    journalism_nonuk_stream_h264_flv_200_akamai          flv        400x224    h264@ 176k, 1001.77KiB
    journalism_nonuk_stream_h264_flv_400_akamai          flv        400x224    h264@ 512k, 2.85MiB
    journalism_nonuk_stream_h264_flv_med_akamai          flv        640x360    h264@ 800k, 4.43MiB
    journalism_nonuk_stream_h264_flv_hi_akamai           flv        688x384    h264@1500k, 8.34MiB
    journalism_world_stream_h264_http_200_sis_news_http  mp4        400x224    h264@ 176k, 1001.77KiB
    journalism_world_stream_h264_http_400_sis_news_http  mp4        400x224    h264@ 512k, 2.85MiB
    journalism_world_stream_h264_http_hi_sis_news_http   mp4        688x384    h264@1500k, 8.34MiB (best)

    # 9afa177 ( same url, non-news mediaselector: http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/journalism-pc/vpid/ )
    format code                                  extension  resolution note
    journalism_nonuk_stream_h264_flv_lo_akamai   flv        384x216    h264@ 496k, 2.76MiB
    journalism_nonuk_stream_h264_flv_med_akamai  flv        640x360    h264@ 800k, 4.43MiB
    journalism_nonuk_stream_h264_flv_hi_akamai   flv        688x384    h264@1500k, 8.34MiB (best)

This change corrects the above, by trying /mediaselector/5 if /mediaselector/4 fails.
 2015-07-27 04:24:04 -05:00
Jaime Marquínez Ferrándiz 4c6bd5b5b6 [youtube] Use 'vp8' and 'vp9' in lowercase (fixes #6358) 
That's how YouTube reports them in their DASH manifest.
 2015-07-26 14:14:28 +02:00
tippfeler aeb7b41d44 [spiegel] Accept iframe urls 
Closes #6370.
 2015-07-26 14:00:56 +02:00
Sergey M․ 5bdec59de1 [comcarcoff] Add support for singleshots (Closes #6366) 2015-07-26 09:51:54 +06:00
remitamine dfaba1ab95 [shahid] fix variable name 2015-07-25 19:14:18 +01:00
remitamine a62fd1af27 [shahid] improve info extraction 2015-07-25 18:13:44 +01:00
Sergey M․ 7a89681722 [bbc] Skip DASH until supported 2015-07-25 22:32:54 +06:00
Sergey M․ 51da40e621 [bbc] PEP8 2015-07-25 22:19:54 +06:00
Sergey M․ d8f0a9ecea [youtube] Respect noplaylist for multifeed videos 2015-07-25 22:17:06 +06:00
Sergey M․ cf7e015f25 [youtube] Add support for multifeed videos 2015-07-25 21:30:34 +06:00
Sergey M․ 1af330f29f Merge branch 'atomicdryad-pr-bbcnews' 2015-07-25 20:22:13 +06:00
Sergey M․ 9afa1770d1 [bbc] Improve playlist extraction, refactor, expand support and document 2015-07-25 20:21:42 +06:00
Yen Chi Hsuan 2c7c721933 [ir90tv] Optional fields should be non-fatal 2015-07-25 18:48:00 +08:00
Yen Chi Hsuan 7523647391 [ir90tv] PEP8 2015-07-25 18:43:07 +08:00
Yen Chi Hsuan 9700cd9097 [ir90tv] Improve title extraction 2015-07-25 18:42:40 +08:00
Yen Chi Hsuan eab7faa0c1 [ir90tv] Test (?:www\.)? part in _VALID_URL 2015-07-25 18:39:01 +08:00
Yen Chi Hsuan a56c1e38c7 Merge branch 'ir90tv' of https://github.com/cyb3r/youtube-dl into cyb3r-ir90tv 2015-07-25 18:36:04 +08:00
Sergey M․ 40a2d17052 [soundcloud:playlist] Defer download link resolve 2015-07-25 15:48:44 +06:00
Sergey M․ b14fa8e687 [soundcloud:set] Defer download link resolve (Closes #6354) 2015-07-25 15:47:53 +06:00
Sergey M․ 678e436f2e [youtube] Handle empty allowed regions (Closes #6351) 2015-07-25 02:09:34 +06:00
Sergey M․ ff81c4c99c Merge branch 'pr-bbcnews' of https://github.com/atomicdryad/youtube-dl into atomicdryad-pr-bbcnews 2015-07-24 20:21:48 +06:00
Sergey M. 420658e6cb Merge pull request #6350 from remitamine/letv 
[letv] fix height
 2015-07-24 20:03:44 +06:00
remitamine 593ddd851b [letv] fix height 2015-07-24 14:46:45 +01:00
Yen Chi Hsuan 1243402657 [dailymotion:playlist] Detect problematic redirection (fixes #6347) 2015-07-24 21:29:44 +08:00
remitamine 1a117a7728 [clipfish] extract mp4 video link 2015-07-24 12:00:20 +01:00
Sergey M․ 2b2ee140c3 [dailymotion:user] Fix _VALID_URL (Closes #6346) 2015-07-24 03:40:24 +06:00
Sergey M․ d97f5cd795 [bbccouk] Make more robust (Closes #6345) 2015-07-24 02:56:54 +06:00
Sergey M․ f3f0b8e403 [canalplus] Modernize 2015-07-24 00:21:13 +06:00
Sergey M․ 660f9459da [canalplus] Fix m3u8 videos extension 2015-07-24 00:17:36 +06:00
Sergey M․ 10952eb2cf [extractor/common] Consistent URL spelling 2015-07-23 23:37:45 +06:00
Sergey M. cdad742700 Merge pull request #6306 from jaimeMF/extract_start_time 
[youtube] Extract start_time
 2015-07-23 23:33:54 +06:00
Sergey M․ a9e8f60ef6 [rtlnl] Update unencrypted streams comment (#6337) 2015-07-23 23:20:24 +06:00
corone17 a8b7b26068 Undo adaptive -> flash workaround 
For a couple of days now rtlXL's non-DRM adaptive (m3u8) streams don't work anymore. By undoing the adaptive -> flash workaround youtube-dl returns the DRM streams again. Too bad for foreigners (geoblock).
The progressive streams still work fine.
 2015-07-23 23:08:39 +06:00
Sergey M․ ba911137fa [rts] Add support for articles with videos on rhs (Closes #6332) 2015-07-23 22:50:59 +06:00
Sergey M․ d3f007af18 [daylimotion] Adapt to player v5 and modernize (Closes #6151, closes #6250) 2015-07-23 22:04:47 +06:00
Jaime Marquínez Ferrándiz 2929fa0e79 [youtube] Also look into the 'start' field for start_time 2015-07-23 13:21:18 +02:00
Jaime Marquínez Ferrándiz 297a564bee [youtube] Extract end_time 2015-07-23 13:20:21 +02:00
fnord 53b8247cb5 NationalGeographic._VALID_URL: work site-wide 
Closes #6343.
 2015-07-23 12:21:41 +02:00
Yen Chi Hsuan b73b14f72c [viki] Rewrite dict selection codes 2015-07-23 14:02:19 +08:00
Yen Chi Hsuan 41597d9bed [viki] Fix description extraction (closes #6339) 2015-07-23 13:39:19 +08:00
Jaime Marquínez Ferrándiz b37317d8b0 [generic] Unescape HTML escape sequences in redirect urls (fixes #6311) 2015-07-22 23:33:49 +02:00
Jaime Marquínez Ferrándiz 87dc451108 [youtube] Don't use the DASH manifest from 'get_video_info' if 'use_cipher_signature' is True (#5118) 
Currently they give a 403 Forbidden error.
 2015-07-22 23:27:41 +02:00
Jaime Marquínez Ferrándiz ca4456eda8 [tagesschau] Remove unused import 2015-07-22 23:23:38 +02:00
Sergey M․ 993df6bc22 [prosiebensat1] Modernize 2015-07-23 03:05:16 +06:00
Sergey M․ 61be92e26a [prosiebensat1] Recognize DRM protected videos (#6334) 2015-07-23 03:04:23 +06:00
Sergey M․ c59b61c0da [viki] Fix height (Closes #6333) 2015-07-23 02:13:51 +06:00
Sergey M․ 3e214851a4 [tagesschau] Improve tests 2015-07-23 01:01:35 +06:00
Sergey M․ a47b602b08 [tagesschau] Add support for audio 2015-07-23 01:01:04 +06:00
Sergey M․ 948199deac [tagesschau] Relax _VALID_URL and simplify 2015-07-23 00:30:48 +06:00
Sergey M․ c356620ec1 Merge branch 'patch/enhance-tagesschau-regex' of https://github.com/rohieb/youtube-dl into rohieb-patch/enhance-tagesschau-regex 2015-07-23 00:12:46 +06:00
Sergey M․ c7620992d2 [pbs] No need to escape colon 2015-07-22 23:49:55 +06:00
Sergey M․ ce1bafdce9 [pbs] Clean up title construction rationale 2015-07-22 23:49:08 +06:00
Sergey M. 9872e588c8 Merge pull request #6292 from atomicdryad/pr-fix_pbs_titles 
pbs: fix vague 'Full Episode' titles; prepend name of show
 2015-07-22 23:42:19 +06:00
Sergey M․ d609edf4f1 [udemy] Handle already-logged-in scenario (Closes #6327) 2015-07-22 22:49:00 +06:00
Yen Chi Hsuan 40101dc311 [lecture2go] Make optional fields non-fatal 2015-07-22 23:25:32 +08:00
Yen Chi Hsuan e9c6deffee [lecture2go] Add more metadata fields 2015-07-22 23:22:19 +08:00
Yen Chi Hsuan 1e12429564 [lecture2go] Update _TEST 2015-07-22 23:05:14 +08:00
Yen Chi Hsuan 795704f0f1 [lecture2go] Support more formats 2015-07-22 22:39:46 +08:00
Yen Chi Hsuan 981b9cdc8c [lecture2go] Improve some regular expressions 2015-07-22 22:09:01 +08:00
Yen Chi Hsuan 3f724339db Merge branch 'lecture2go' of https://github.com/nichdu/youtube-dl into nichdu-lecture2go 2015-07-22 20:10:45 +08:00
Sergey M․ c84683c88b [viewster] Strip titles 2015-07-22 02:08:25 +06:00
Sergey M․ b68a2613f8 [viewster] Rewrite for new API (Closes #6317) 2015-07-22 02:00:21 +06:00
Jaime Marquínez Ferrándiz 28afa6e77a [snagfilms] Don't use '_' as a variable that is used 2015-07-21 20:50:02 +02:00
Sergey M․ 496ce6b349 [snagfilms] Improve m3u8 extraction (Closes #6309) 2015-07-21 23:54:31 +06:00
Jaime Marquínez Ferrándiz 7c80519cbf [youtube] Extract start_time 
From the 't=*' in the url.
Currently youtube-dl doesn't use the value, but it was requested for the mpv plugin.
 2015-07-20 21:10:28 +02:00
Jaime Marquínez Ferrándiz 2fe1ff8582 [youtube] Set 'is_live' 2015-07-20 20:14:20 +02:00
Jaime Marquínez Ferrándiz 17ee98e1a5 [youtube] Fix upload_date in test 2015-07-20 19:48:50 +02:00
Jaime Marquínez Ferrándiz 2ee8f5d80f Merge remote-tracking branch 'yan12125/download-dash-segments' (#5886) 2015-07-20 19:34:24 +02:00
Yen Chi Hsuan 3f302bca8c [tumblr] Improve downloading notes 2015-07-20 18:54:47 +08:00
Yen Chi Hsuan c909e5820e [tumblr] Delegate to GenericIE for non-tumblr videos 
Fixes #6162
 2015-07-20 18:51:25 +08:00
Yen Chi Hsuan a1b85269a4 [extractor/generic] Support vid.me embeds 2015-07-20 18:49:53 +08:00