mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-04 04:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
9526 commits 3 branches 101 tags 115 MiB
Commit graph

5672 commits

Author SHA1 Message Date
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
Sergey M․ faa1f83ab4 [twitch:stream] Improve _VALID_URL (Closes #6294) 2015-07-20 02:16:07 +06:00
Sergey M․ 308c505c3d [francetv] Improve _VALID_URL 2015-07-20 01:03:43 +06:00
fnord 0eacd2aaae less clunky if statement 2015-07-19 13:59:12 -05:00
Sergey M․ 18ae46ad4b [vice] Modernize 2015-07-20 00:42:25 +06:00
Sergey M․ 65c2b21df1 [vice] Make test only matching 2015-07-20 00:40:43 +06:00
Sergey M․ 772acaf31f [vice] Do not capture unused groups in _VALID_URL 2015-07-20 00:39:55 +06:00
Sergey M. f8d0745e27 Merge pull request #6291 from atomicdryad/pr-fixvice 
fix/support news.vice.com
 2015-07-20 00:39:16 +06:00
Sergey M․ d719c6a5ab [ard:mediathek] Add test for direct mp4 2015-07-20 00:13:39 +06:00
Sergey M․ 769efa16af [ard:mediathek] Remove dead test 2015-07-20 00:08:21 +06:00
Sergey M․ 86b4e98ac6 [ard:mediathek] Add audio test 2015-07-20 00:05:10 +06:00
Sergey M․ 3bf8c316a6 [sportschau] Reimplement in terms of ard extractor 2015-07-20 00:01:22 +06:00
Sergey M․ e37c92ec6d [ard] Extract all formats 2015-07-19 23:59:50 +06:00
fnord a5dd9a0c5d pbs: fix vague 'Full Episode' titles; prepend name of show 
Many videos are given the title 'Full Episode' or 'Episode x', etc;
in the info json 'title' is the episode title (for oneshots this is
'Full Episode') while the program name is 'program':{'title'. This
changes the title from '(episode title)' to
 '(program name) - (episode title)'

The following urls demonstrate useless titles

    http://video.pbs.org/video/2365367186/
    http://video.pbs.org/video/2365519307/
    http://video.pbs.org/video/2365527039/
    http://video.pbs.org/video/2365530605/

Before change

    Full Episode
    Episode 5 | Preview
    Season 3 | Episode 4 Preview
    July 17, 2015

After change

    To Catch A Comet - Full Episode
    The Crimson Field - Episode 5 | Preview
    Last Tango in Halifax - Season 3 | Episode 4 Preview
    Charlie Rose The Week - July 17, 2015
 2015-07-19 11:47:58 -05:00
fnord 7a4a945f13 fix/support news.vice.com 2015-07-19 11:33:02 -05:00
Sergey M․ 1d18e26eca [francetv] Remove unused import 2015-07-19 21:54:12 +06:00
Sergey M․ ac4b8df5e4 [francetv] Fix embed test 2015-07-19 21:53:54 +06:00
Sergey M․ 3bc9fb5889 [francetv] Update jt test 2015-07-19 21:53:09 +06:00
Sergey M․ 632cbb8efa [francetv] Fix f4m extraction completely 2015-07-19 21:51:06 +06:00
Sergey M․ 789a12aaaf [francetv] Restore support for jt videos 2015-07-19 21:50:25 +06:00
Sergey M․ ecdbe09e10 [francetv] Fix f4m extraction 2015-07-19 21:45:49 +06:00
Zach Bruggeman 1dc31c2786 [appleconnect] Add new extractor (fixes #6189) 
Closes #6190.
 2015-07-19 13:00:30 +02:00
Jaime Marquínez Ferrándiz 32470bf619 [sportschau] Improve title extraction 
The html '<title>' ends with '- sportschau.de', which shouldn't be part of the title.
 2015-07-19 11:27:12 +02:00
Jaime Marquínez Ferrándiz 8b61bfd638 [sportschau] skip download in test 2015-07-19 11:27:12 +02:00
slangangular 8a7a208905 [sportschau] Add support for sportschau.de 
Closes #6199.
 2015-07-19 11:25:51 +02:00
Jaime Marquínez Ferrándiz 0215103e92 [francetv] Remove unused import 2015-07-19 11:13:27 +02:00
Yen Chi Hsuan c2d1be8981 [iqiyi] Add skip_download to reduce network traffic 
MD5 checksums are commented out in
36068ae019, and actual downloads are not
necessary anymore.
 2015-07-19 11:20:05 +08:00
Roland Hieber 726adc43ec [tagesschau] set description=None for empty descriptions 2015-07-19 05:09:29 +02:00
Roland Hieber 3c6ae8b59e [tagesschau] add support for Bericht aus Berlin videos 2015-07-19 04:28:00 +02:00
Roland Hieber c51bc70e0f [tagesschau] fix test which links to nonexisting video 2015-07-19 03:52:58 +02:00
Roland Hieber e89d7e3029 [tagesschau] add support for more video types 
I found that currently only tagesschau videos are played. There are some
more shows hosted on tagesschau.de (see [0] for example) which are
easily playable by adjusting the regex. So this patch adds support for:
* tagesthemen
* tagesschau vor 20 Jahren
* tagesschau (mit Gebärdensprache)
* nachtmagazin

Note that some videos don't provide a description, so in order for the
tests to succeed, an ExtractorError needs to get caught.

[0]: http://www.tagesschau.de/multimedia/video/videoarchiv2~_date-20150714.html
 2015-07-19 03:44:16 +02:00
remitamine 3c07a729a6 [shahid] don't fail on missing info 2015-07-18 23:16:57 +01:00
remitamine 84c0ed50a5 [shahid] fix backets closing 2015-07-18 23:10:20 +01:00
remitamine 02c126a7c2 [shahid] raise ExtractorError instead of warning 2015-07-18 22:55:40 +01:00
remitamine 114ed20e64 [shahid] Add new extractor 2015-07-18 22:10:57 +01:00
Yen Chi Hsuan 4b0f45f667 Merge branch 'sceext2-fix-iqiyi-2015-07-17' 2015-07-19 03:57:36 +08:00
Yen Chi Hsuan 36068ae019 [iqiyi] Comment out some MD5 sums 
The value is different on Travis CI server
 2015-07-19 03:54:59 +08:00
remitamine 9d681c2bb3 remove unnecessary group name 2015-07-18 20:40:56 +01:00
remitamine 3af1fac7b0 [dcn] Add new extractor 2015-07-18 20:40:56 +01:00
Yen Chi Hsuan 761ee0d827 [iqiyi] Remove unused imports 2015-07-19 02:28:43 +08:00
Sergey M․ 826a7da808 [rtlnl] Avoid episodes completely (Closes #6275) 2015-07-19 00:27:23 +06:00
Sergey M․ cbd55ade68 [extractor/generic] Add support for francetv embeds 2015-07-18 22:56:00 +06:00
Sergey M․ 5705ee6ef8 [francetv] Fix duration extraction 2015-07-18 22:43:42 +06:00
Sergey M․ 3f5c6d0c1b [francetv] Add support for embeds and clean up _VALID_URL 2015-07-18 22:41:34 +06:00
Sergey M․ e58066e244 [vk] Add age restricted video test for reference 2015-07-18 19:25:06 +06:00
Sergey M․ ee48b6a88f [vk] Capture error message 2015-07-18 19:15:20 +06:00
Sergey M․ 9ac09ed4de [bliptv] Remove unused import 2015-07-18 19:13:10 +06:00
Sergey M․ fec73daaa3 [vk:uservideos] Revert orderedSet 2015-07-18 18:23:35 +06:00
Sergey M․ c6b68648f4 [bilibili] Show georestriction error 2015-07-18 17:36:46 +06:00
Sergey M․ 1ecb5d1d83 [vk] Clarify extractor names 2015-07-18 17:23:33 +06:00
Sergey M․ dc786d3db5 [vk:uservideos] Improve extraction 2015-07-18 17:22:25 +06:00
Sergey M․ 74fe23ec35 [extractor/common] Style 2015-07-18 16:35:28 +06:00
sceext 1b541d8d6e [iqiyi] fix iqiyi (2015-07-17), update the md5 salt (enc_key) to iqiyi latest (2015-07-17) flash player. 2015-07-18 12:34:26 +08:00
Sergey M․ f29ac588dd [nationalgeographics] Fix extraction (Closes #6262) 2015-07-18 06:33:50 +06:00
Sergey M․ 0696667734 [twitch:stream] Clarify channel_id reassignment rationale (#6263) 2015-07-18 06:27:45 +06:00
Sergey M․ 1793d71db6 [twitch:stream] Fix channel_id in different case (Closes #6263) 2015-07-18 06:18:03 +06:00
Sergey M․ 4211e1941b [videomega] Add shortcut to _VALID_URL 2015-07-18 04:27:09 +06:00
Sergey M․ 4bdfef5a18 [videomega] Add tests 2015-07-18 04:25:30 +06:00
Sergey M․ 8a37f53685 [videomega] Revert iframe URL 2015-07-18 04:25:10 +06:00
Sergey M․ 4e1ad6e9a8 [videomega] Extend _VALID_URL and improve extraction (Closes #6260) 2015-07-18 04:13:45 +06:00
Sergey M․ 3c283a381e [sbs] Simplify 2015-07-18 02:43:18 +06:00
Sergey M․ dac4d5be12 Merge branch 'sbs_website_changes' of https://github.com/seamusphelan/youtube-dl into seamusphelan-sbs_website_changes 2015-07-18 02:13:55 +06:00
Sergey M․ 530857182d [bliptv] Add test with missing duration 2015-07-18 01:45:54 +06:00
Sergey M․ 9441f77faa [bliptv] Use xpath for extraction and fix test 2015-07-18 01:45:36 +06:00
Sergey M․ 6b19647d57 [veehd] Use compat_urllib_parse_unquote 2015-07-18 00:04:25 +06:00
Sergey M․ 7bd42d0d96 [openfilm] Fix compat_urllib_parse_unquote_plus import 2015-07-17 23:56:27 +06:00
Sergey M․ c60e8cfaf7 [ehow] Simplify 2015-07-17 23:54:38 +06:00
Sergey M․ 7fd002c006 [youtube] Use compat_urllib_parse_unquote and compat_urllib_parse_unquote_plus 2015-07-17 23:51:57 +06:00
Sergey M․ db6c50f109 [ynet] Use compat_urllib_parse_unquote_plus 2015-07-17 23:50:52 +06:00
Sergey M․ aa4789d632 [xvideos] Use compat_urllib_parse_unquote 2015-07-17 23:50:25 +06:00
Sergey M․ ee8de13e14 [xtube] Use compat_urllib_parse_unquote 2015-07-17 23:50:02 +06:00
Sergey M․ 7dde5f6a8d [xnxx] Use compat_urllib_parse_unquote 2015-07-17 23:49:38 +06:00
Sergey M․ 736f003f2e [xbef] Use compat_urllib_parse_unquote 2015-07-17 23:49:14 +06:00
Sergey M․ 47af21e8f1 [spankwire] Use compat_urllib_parse_unquote 2015-07-17 23:47:51 +06:00
Sergey M․ 605cbef653 [pornhub] Use compat_urllib_parse_unquote and compat_urllib_parse_unquote_plus 2015-07-17 23:47:23 +06:00
Sergey M․ 388ad0c05c [playvid] Use compat_urllib_parse_unquote and compat_urllib_parse_unquote_plus 2015-07-17 23:46:33 +06:00
Sergey M․ 2ebbb6f1f7 [photobucket] Use compat_urllib_parse_unquote 2015-07-17 23:45:55 +06:00
Sergey M․ d54f1c7477 [openfilm] Use compat_urllib_parse_unquote_plus 2015-07-17 23:45:26 +06:00
Sergey M․ b78f5ec4c3 [odnoklassniki] Use compat_urllib_parse_unquote 2015-07-17 23:45:00 +06:00
Sergey M․ 9fd3bf04b7 [myvideo] Use compat_urllib_parse_unquote 2015-07-17 23:44:38 +06:00
Sergey M․ e97bb3de83 [mofosex] Use compat_urllib_parse_unquote 2015-07-17 23:43:36 +06:00
Sergey M․ c2daf8dfa4 [mixcloud] Use compat_urllib_parse_unquote 2015-07-17 23:42:43 +06:00
Sergey M․ 09b718c439 [mitele] Use compat_urllib_parse_unquote 2015-07-17 23:42:11 +06:00
Sergey M․ c177bb3a50 [metacafe] Use compat_urllib_parse_unquote 2015-07-17 23:41:47 +06:00
Sergey M․ 977a247a06 [malemotion] Use compat_urllib_parse_unquote 2015-07-17 23:41:14 +06:00
Sergey M․ 899a3e2f13 [karaoketv] Use compat_urllib_parse_unquote_plus 2015-07-17 23:40:35 +06:00
Sergey M․ 8ee4ecb48d [infoq] Use compat_urllib_parse_unquote 2015-07-17 23:39:54 +06:00
Sergey M․ f7e6f7fa23 [extractor/generic] Use compat_urllib_parse_unquote 2015-07-17 23:39:32 +06:00
Sergey M․ 1f80e360fc [gamespot] Use compat_urllib_parse_unquote 2015-07-17 23:38:30 +06:00
Sergey M․ d7011316d0 [facebook] Use compat_urllib_parse_unquote 2015-07-17 23:37:56 +06:00
Sergey M․ d3671b344f [ehow] Use compat_urllib_parse_unquote 2015-07-17 23:37:23 +06:00
Sergey M․ a60cccbf9f [crunchyroll] Use compat_urllib_parse_unquote 2015-07-17 23:36:58 +06:00
Sergey M․ 3e72f5f10e [ceskatelevize] Use compat_urllib_parse_unquote 2015-07-17 23:36:11 +06:00
Sergey M․ b94b78971c [bet] Use compat_urllib_parse_unquote 2015-07-17 23:35:14 +06:00
Sergey M․ 13fc7f3a05 Merge branch 'atomicdryad-pr-crashfix_compat_urllib_unquote' 2015-07-17 22:59:17 +06:00
Sergey M. eacd875f3b Merge pull request #6259 from remitamine/howstuffworks 
[howstuffwoks] fix _VALID_URL regex
 2015-07-17 22:08:40 +06:00
remitamine c4fe07c7af match only the test url 2015-07-17 17:07:55 +01:00
remitamine 1186e3f91a do not capture a group 2015-07-17 16:45:53 +01:00
remitamine f354385bf5 Add test for urls without a number 2015-07-17 16:43:27 +01:00
remitamine cabe001590 [howstuffwoks] fix _VALID_URL regex 2015-07-17 16:18:33 +01:00
Sergey M․ 89f691e141 Merge branch 'pr-crashfix_compat_urllib_unquote' of https://github.com/atomicdryad/youtube-dl into atomicdryad-pr-crashfix_compat_urllib_unquote 2015-07-17 21:15:55 +06:00
fnord a3bfddfa5e bbc.py: correct syntax 2015-07-17 02:47:02 -05:00
fnord 36da48798a handle titles and captions set to '' 2015-07-17 02:27:50 -05:00
Yen Chi Hsuan a38436e889 [extractor/common] Add 'transform_source' parameter to _extract_f4m_formats() 2015-07-17 12:02:49 +08:00
Sergey M․ 23fc384f2c [npo] Compound title 2015-07-17 01:28:52 +06:00
Sergey M․ 1540119723 [npo] Remove unused imports 2015-07-17 00:54:05 +06:00
Sergey M․ 574f42d79a [vpro] Improve playlist extraction 2015-07-17 00:53:12 +06:00
Sergey M․ 536b0700b0 [npo] Allow missing description 2015-07-17 00:40:04 +06:00
Sergey M․ 5ba761eb85 [npo] Prefer aflevering_titel over titel 2015-07-17 00:39:22 +06:00
Sergey M․ 611ac379bb [vpro] Fix extraction and add support for vpro playlists 2015-07-17 00:34:24 +06:00
Sergey M․ 03f32a7ead [wnl] Add extractor for omroepwnl playlists 2015-07-17 00:14:38 +06:00
Sergey M․ 50ea2bb20d [npo] Update test 2015-07-16 23:56:57 +06:00
Sergey M․ 525daedd5a [npo] Add support for omroepwnl fragments 2015-07-16 23:54:43 +06:00
Sergey M․ e118031ef8 [npo] Extend _VALID_URL to support ntr.nl (Closes #6248) 2015-07-16 23:21:04 +06:00
fnord 45eedbe58c Generic: use compat_urllib_parse_unquote to prevent utf8 mangling 
of the entire page in python 2.

-requires- fixed compat_urllib_parse_unquote

example - the following will save with a mangled playlist title,
 instead of the kanji for 'tsunami'. This affects all utf8encoded
 urls as well

youtube-dl -f18 -o '%(playlist_title)s-%(title)s.%(ext)s' \
  61c14c1e3a/tsunami.html
 2015-07-15 15:30:47 -05:00
Sergey M․ ab9b890b52 [prosiebensat1] Clarify test purpose 2015-07-16 02:23:07 +06:00
Sergey M․ 31c746e5dc [extractor/common] Keep going in some media_url is missing 2015-07-16 01:25:33 +06:00
Sergey M․ f01f731107 [prosiebensat1] Use generic f4m manifest extraction 2015-07-16 01:15:47 +06:00
Sergey M․ 70f0f5a8ca [extractor/common] Recursively extract child f4m manifests 2015-07-16 01:15:15 +06:00
Sergey M․ cc357c4db8 [extractor/common] Properly handle full URLs 2015-07-16 01:14:52 +06:00
Sergey M․ 97f4aecfc1 [extractor/common] Handle malformed f4m manifests 2015-07-16 01:14:08 +06:00
Sergey M․ 2af0f87c8b [prosiebensat1] Fix extraction (Closes #6215) 2015-07-15 23:32:52 +06:00
Sergey M․ 6c1b0c0ed2 [dfb] Extract formats 2015-07-15 00:01:41 +06:00
Sergey M․ ddcdc684e2 [dfb] Extract display_id and modernize 2015-07-14 23:59:21 +06:00
Sergey M․ eae89f92e6 [dfb] Update test 2015-07-14 23:54:13 +06:00
Jaime Marquínez Ferrándiz 01d115b06b [jeuxvideo] Relax _VALID_URL (fixes #6230) 2015-07-14 19:07:40 +02:00
Sergey M․ 79057965a8 [udemy] Remove superfluous field 2015-07-14 22:46:26 +06:00
Sergey M․ dcd4d95c8e [udemy] Fix authentication (Closes #6224) 2015-07-14 22:39:41 +06:00
Sergey M․ cf61d96df0 [extractor/common] Add _form_hidden_inputs 2015-07-14 22:38:10 +06:00
Sergey M․ f8da79f828 [extractor/common] Improve _form_hidden_inputs and rename to _hidden_inputs 2015-07-14 22:36:30 +06:00
cazulu 50aa2bb6b9 [dailymotion] Extract duration (closes #6221) 2015-07-14 12:50:34 +02:00
Sergey M․ 1d1dd597ed [dramafever] Extract srt (Closes #6207) 2015-07-14 01:35:44 +06:00
Yen Chi Hsuan cfe5537ee5 [myspass] Fix extraction (closes #6206) 2015-07-14 00:23:50 +08:00
Sergey M․ 6dfa0602f0 [nowtv] Fix extraction (Closes #6169) 2015-07-13 22:11:05 +06:00
Seamus Phelan 75a40b2251 [SBS] fixes due to website changes 2015-07-13 22:35:45 +10:00
Sergey M․ 28fb109ed0 [rds] Improve _VALID_URL 2015-07-12 23:45:47 +06:00
Sergey M․ b6ea9ef21a [rds] Improve 2015-07-12 23:35:56 +06:00
Sergey M․ b8dd44baa9 Merge branch 'rdsca' of https://github.com/fstirlitz/youtube-dl into fstirlitz-rdsca 2015-07-12 21:34:32 +06:00
Sergey M․ c4f1fde75b [nrk:tv] Add format id prefixes 2015-07-12 20:42:18 +06:00
Sergey M․ 667170e2c7 [nrk:tv] Add support for radio URLs (Closes #6200) 2015-07-12 20:40:00 +06:00
Sergey M․ 53429e6551 [onionstudios] Fix extraction 2015-07-12 12:53:15 +06:00
felix ac8f97f2b3 [rdsca] New extractor 2015-07-11 19:05:17 +02:00
Sergey M․ d919fa3344 [vk] Handle access denied error 2015-07-11 21:26:03 +06:00
Sergey M․ 79913fde35 [vk] Add list id to info_url 2015-07-11 21:23:49 +06:00
Sergey M․ da634d0a8b Merge branch 'dufferzafar-webofstories' 2015-07-11 04:43:55 +06:00
Sergey M․ fac54cb426 [webofstories:playlist] Improve and add test 2015-07-11 04:43:29 +06:00
Sergey M․ 3f19b9b7c1 Merge branch 'webofstories' of https://github.com/dufferzafar/youtube-dl into dufferzafar-webofstories 2015-07-11 04:17:54 +06:00
Jaime Marquínez Ferrándiz 86f2541695 Remove unused 're' imports 2015-07-10 22:22:33 +02:00
Yen Chi Hsuan 181c4ccaaa [qqmusic] Add more localized names 2015-07-11 01:21:36 +08:00
Yen Chi Hsuan ed848087d5 [neteasemusic] Add more localized names 2015-07-11 01:21:18 +08:00
Yen Chi Hsuan edd66be5be [kuwo] Add more localized names 2015-07-11 01:21:04 +08:00
Yen Chi Hsuan 246995dbc8 [youku] Add localized name 2015-07-11 00:58:13 +08:00
Yen Chi Hsuan b931fbe5ab [yinyuetai] Add localized name 2015-07-11 00:57:59 +08:00
Yen Chi Hsuan e014ff015d [yam] Add localized name 2015-07-11 00:53:08 +08:00
Yen Chi Hsuan 4fa5f40232 [xuite] Add localized name 2015-07-11 00:52:56 +08:00
Yen Chi Hsuan 9b15be97aa [udn] Add localized name 2015-07-11 00:52:19 +08:00
Yen Chi Hsuan a7ada46bd9 [qqmusic] Add localized name 2015-07-11 00:52:07 +08:00
Yen Chi Hsuan 9d16788ad9 [nextmedia] Add localized name 2015-07-11 00:51:55 +08:00
Yen Chi Hsuan 6ce89aecc3 [neteasemusic] Add localized name 2015-07-11 00:51:35 +08:00
Yen Chi Hsuan 963d0ce7e3 [letv] Add localized name 2015-07-11 00:51:26 +08:00
Yen Chi Hsuan 0f08d7f851 [kuwo] Add localized name 2015-07-11 00:51:14 +08:00
Yen Chi Hsuan 44c514eb9c [iqiyi] Add localized name 2015-07-11 00:51:03 +08:00
Yen Chi Hsuan 513cbdda93 [douyutv] Add localized name 2015-07-11 00:50:45 +08:00
Yen Chi Hsuan e1ba152352 [ctsnews] Add localized name 2015-07-11 00:50:31 +08:00
Yen Chi Hsuan 446e764500 [baidu] Add localized name 2015-07-11 00:49:59 +08:00
Yen Chi Hsuan 901d00caa6 Merge branch 'ping-kuwo' 2015-07-11 00:11:41 +08:00
Yen Chi Hsuan 094790d2c9 [kuwo:song] Give warnings for unavailable optional fields 2015-07-11 00:03:49 +08:00
Sergey M․ 1c0163a5cc [gorillavid] Use _form_hidden_inputs 2015-07-10 21:58:49 +06:00
Sergey M․ 8fa7e5817a [hostingbulk] Use _form_hidden_inputs 2015-07-10 21:58:24 +06:00
Sergey M․ 01b89d5682 [played] Use _form_hidden_inputs 2015-07-10 21:57:29 +06:00
Yen Chi Hsuan 9f01c1a803 [kuwo] Use \d instead of [0-9] 2015-07-10 23:56:51 +08:00
Sergey M․ 46f0f50016 [primesharetv] Use _form_hidden_inputs 2015-07-10 21:56:41 +06:00
Sergey M․ b8070dbbd7 [promptfile] Use _form_hidden_inputs 2015-07-10 21:56:14 +06:00
Sergey M․ 3b16d803c9 [shared] Use _form_hidden_inputs 2015-07-10 21:55:22 +06:00
Sergey M․ de195c23a6 [vimeo] Use _form_hidden_inputs 2015-07-10 21:54:39 +06:00
Yen Chi Hsuan d3b8908886 [kuwo] Simpler calls to url_result() 2015-07-10 23:53:48 +08:00
Sergey M․ 2688176c77 [vodlocker] Use _form_hidden_inputs 2015-07-10 21:53:38 +06:00
Sergey M․ a5839317aa [vk] Use _form_hidden_inputs when logging in 2015-07-10 21:52:03 +06:00
Sergey M․ a0aab26a41 [twitch] Use _form_hidden_inputs when logging in 2015-07-10 21:49:39 +06:00
Sergey M․ 27713812a0 [extractor/common] Add method for extracting form hidden input fields as dict 2015-07-10 21:49:09 +06:00
Yen Chi Hsuan cf2c5fda4f [kuwo] Use single quotes 2015-07-10 23:48:48 +08:00
Yen Chi Hsuan a9684c0dbf [kuwo] Add KuwoBaseIE 2015-07-10 23:46:44 +08:00
Sergey M․ c0bf5e1c4d [twitch] Fix non-ASCII logins/passwords on python 2 2015-07-10 21:40:21 +06:00
Yen Chi Hsuan a31e3e7dcb [kuwo] Regular expression improvements 
1. Prevent .+ and .*
2. Use [^>]+ instead of spaces for HTML tags
3. Remove unnecessary trailing parts
 2015-07-10 23:38:54 +08:00
Sergey M․ 17b41a3337 [twitch] Show reset password request 2015-07-10 21:16:42 +06:00
Sergey M․ 89a683ae74 [twitch] Fix error message regex 2015-07-10 21:15:09 +06:00
Sergey M․ 008661069b Merge branch 'master' of github.com:rg3/youtube-dl 2015-07-10 20:56:08 +06:00
Sergey M․ 9296e92e1c [twitch] Fix login (Closes #6186) 2015-07-10 20:55:53 +06:00
Yen Chi Hsuan a34af8d066 [kuwo] PEP8 2015-07-10 19:13:52 +08:00
Yen Chi Hsuan 8726e04629 Merge branch 'kuwo' of https://github.com/ping/youtube-dl into ping-kuwo 2015-07-10 19:11:58 +08:00
Yen Chi Hsuan 4eab60cbd2 [netease:djradio] Use compat_itertools_count 2015-07-10 18:59:12 +08:00
Yen Chi Hsuan 397a8ea96e [neteasemusic] Encoding fixes for Python 2.6 and 3.x 2015-07-10 18:43:38 +08:00
Yen Chi Hsuan 15830339ef [neteasemusic] PEP8 2015-07-10 18:30:23 +08:00
Yen Chi Hsuan b29280285e Merge branch 'neteasemusic' of https://github.com/ping/youtube-dl into ping-neteasemusic 2015-07-10 18:25:12 +08:00
ping 1633491bff [kuwo] Merge KuwoSingerMusicIE into KuwoSingerIE (missed kuwo.py) 2015-07-10 15:19:07 +08:00
ping 2b0fa1f7dd [kuwo] Merge KuwoSingerMusicIE into KuwoSingerIE 2015-07-10 15:09:12 +08:00
ping 02b386f80a [neteasemusic] Changes after review 2015-07-10 13:29:57 +08:00
Sergey M․ bf20b9c540 [extractor/generic] Add test for myvi embed 2015-07-10 01:15:55 +06:00
Sergey M․ 06a12933f3 [pbs] Add support for subtitles (Closes #6184) 2015-07-10 00:58:01 +06:00
Sergey M․ 6dd94d3a79 [myvi:embed] Rename to myvi 2015-07-10 00:27:44 +06:00
Sergey M․ f2f89c762a [myvi:embed] Improve _VALID_URL 2015-07-10 00:27:02 +06:00
Sergey M․ e6c2d9ad29 [extractor/generic:myvi] Add support for myvi embeds 2015-07-10 00:25:36 +06:00
Sergey M․ 83423254cc [myvi:embed] Extend _VALID_URL 2015-07-10 00:07:26 +06:00
Sergey M․ 1c20ddc966 [myvi:embed] Add extractor (Closes #6167) 2015-07-09 23:53:50 +06:00
Sergey M․ 675e9f22ea [vimple] Extract spruto player based extractor class 2015-07-09 23:52:03 +06:00
Sergey M․ 77c6fb5b24 [youtube] Make further DASH manifests not fatal after succeeded one 2015-07-09 20:48:38 +06:00
Sergey M․ 082a0140ef [yinyuetai] Do not capture unused group 2015-07-08 23:40:19 +06:00
Yen Chi Hsuan d76dea001b [yinyuetai] Miscellaneous improvements 
1. Include all fields in _TEST
2. Use .get() for optional fields
3. Clarify the intention of 'ext' in formats
 2015-07-09 01:07:45 +08:00
Yen Chi Hsuan af0f9b0e95 [yinyuetai] Style 2015-07-09 00:54:37 +08:00
Yen Chi Hsuan e2082ea942 [yinyuetai] Add test for h5/ part in _VALID_URL 2015-07-09 00:50:32 +08:00
Yen Chi Hsuan 68923e52a3 Merge branch 'yinyuetai' of https://github.com/ping/youtube-dl into ping-yinyuetai 2015-07-09 00:48:23 +08:00
Sergey M․ 9281f6d253 [vk] Add test for youtube embed 2015-07-08 20:41:08 +06:00
Sergey M․ 4647845679 [vk] Fix youtube extraction 2015-07-08 20:34:50 +06:00
Sergey M․ cf9cf7dd04 [vk] Extend _VALID_URL to handle biqle.ru (Closes #6179) 2015-07-08 20:27:06 +06:00
Yen Chi Hsuan 1316b54956 [clipsyndicate] Use _match_id 2015-07-08 13:43:23 +08:00
Yen Chi Hsuan cbc1fadd6f [clipsyndicate] Support chic subdomain (fixes #6176) 2015-07-08 13:40:21 +08:00
Yen Chi Hsuan 267dc07e6b [gfycat] Catch errors 2015-07-07 14:22:13 +08:00
Yen Chi Hsuan d7b4d5dd50 [gfycat] Extract id correctly (fixes #6165) 2015-07-07 14:16:56 +08:00
Sergey M․ 7f220b2fac [vk] Catch ownership confirmation request 2015-07-07 00:04:19 +06:00
Sergey M․ 275c0423aa [vk] Fix extraction (Closes #6153) 2015-07-07 00:02:34 +06:00
Yen Chi Hsuan 85a064861f [qqmusic] Use regex for thumbnails in test cases 2015-07-06 17:54:41 +08:00
Yen Chi Hsuan d0b436bff2 Merge branch 'qqmusic-format-fix' of https://github.com/ping/youtube-dl into ping-qqmusic-format-fix 2015-07-06 17:24:44 +08:00
Yen Chi Hsuan dfc4eca21f [qqmusic:album] Playlist names are optional 2015-07-06 17:09:17 +08:00
Yen Chi Hsuan fc7ae675e2 [qqmusic:album] Strip description 2015-07-06 17:08:32 +08:00
Yen Chi Hsuan 804ad79985 Merge branch 'qqmusic-album-fix' of https://github.com/ping/youtube-dl into ping-qqmusic-album-fix 2015-07-06 17:01:59 +08:00
Yen Chi Hsuan e9d33454b5 [qqmusic:playlist] Playlist names are optional 2015-07-06 16:19:49 +08:00
Yen Chi Hsuan d80891efc4 Merge branch 'qqmusic-playlist' of https://github.com/ping/youtube-dl into ping-qqmusic-playlist 2015-07-06 16:08:30 +08:00
ping 37c1e4025c [yinyuetai] New extractor for yinyuetai.com 2015-07-06 15:26:49 +08:00
Yen Chi Hsuan 59a83d3e5b [spiegeltv] Skip invalid m3u8 manifests (closes #6157) 2015-07-06 08:41:14 +08:00
Yen Chi Hsuan 13af92fdc4 [common] Add 'fatal' to _extract_m3u8_formats 2015-07-06 08:39:38 +08:00
Sergey M․ 0c20ee7d4b [rtlnl] Clarify current adaptive -> flash workaround rationale 2015-07-06 04:16:56 +06:00
Sergey M․ 89d42c2c75 [rtlnl] Clarify test 2015-07-06 02:58:02 +06:00
Sergey M․ 9dfc4fa1a1 [rtlnl] Add test with encrypted m3u8 streams for reference 2015-07-05 19:07:07 +06:00
Sergey M․ 43232d5c14 [rtlnl] Improve 2015-07-05 19:01:07 +06:00
Sergey M․ f7c272d4fa Merge branch 'patch-1' of https://github.com/corone17/youtube-dl into corone17-patch-1 2015-07-05 18:07:39 +06:00
Sergey M․ ede21449c8 [crunchyroll] Fix extraction (Closes #5855, closes #5881) 2015-07-05 06:29:36 +06:00
Sergey M․ e56a4c9e9b [thisamericanlife] Improve and simplify 2015-07-04 05:42:53 +06:00
Eric Wong 95506e37af [thisamericanlife] Remove unnecessary comment 2015-07-04 05:12:28 +06:00
Eric Wong e41840c522 [thisamericanlife] get info from <meta> tags 2015-07-04 05:12:20 +06:00
Eric Wong 2a46a27e6c [thisamericanlife] Add a new extractor 2015-07-04 05:12:10 +06:00
Sergey M․ 0bcdc27653 [dailymotion:cloud] Extend _VALID_URL (Closes #6145) 2015-07-03 22:47:52 +06:00
Sergey M․ ddf0f74de7 [howcast] Fix extraction and modernize 2015-07-03 22:32:56 +06:00
Yen Chi Hsuan 91b21b2334 [infoq] Fix extraction (closes #6141) 2015-07-03 11:54:36 +08:00
Sergey M․ 66e568de3b [extractor/generic] Improve kaltura embeds support (Closes #6137) 2015-07-02 21:39:46 +06:00
Sergey M․ f5ca97e393 [npo] Clarify token decryption algorithm source 2015-07-02 20:20:09 +06:00
Yen Chi Hsuan 8d06a62485 [npo] Decrypting token (closes #6136) 2015-07-02 16:47:55 +08:00
Yen Chi Hsuan 93f9420993 [pbs] Add coding declaration 
Python 2.x does not work without it.
 2015-07-02 13:13:27 +08:00
Yen Chi Hsuan 5b61070c70 [pbs] skip_download for m3u8 test cases 2015-07-02 13:08:48 +08:00
Yen Chi Hsuan dbe1a93526 [pbs] Fix player URL (closes #6139) 2015-07-02 13:05:43 +08:00
Sergey M․ 86511ea417 [drtuber] Fix extraction 2015-07-01 21:47:56 +06:00
Sergey M. 33f1f81b8b Merge pull request #6132 from alarig/master 
Add support of HTTPS for ina.fr
 2015-06-30 20:53:49 +06:00
Sergey M․ 9d0b581fea [youtube] Prefer meta for upload date and modernize 2015-06-30 20:52:26 +06:00
alarig c05724cb18 Add support of HTTPS for ina.fr 2015-06-30 16:47:14 +02:00
Sergey M․ f0714c9f86 [youtube] Speed up upload date regex (#6125) 2015-06-30 01:02:48 +06:00
Sergey M․ cf386750c9 [hentaistigma] Modernize 2015-06-29 22:21:09 +06:00
Sergey M. 54f428f645 Merge pull request #6120 from nawl/master 
[hentaistigma] Fix video extractor
 2015-06-29 21:14:49 +05:00
Sergey M. dc2bd20e55 Merge pull request #6098 from dstftw/use-codecs-from-dash-manifest 
[youtube] Pick up codecs info from DASH manifest when not set explicitly
 2015-06-29 20:58:52 +05:00
Sergey M. c608ee491f Merge pull request #6097 from dstftw/union-itags-from-multiple-dashmpd 
[youtube] Extract formats from multiple DASH manifests (Closes #6093)
 2015-06-29 20:58:34 +05:00
nawl 738b926322 [hentaistigma] Fix video extractor 2015-06-28 17:24:00 -06:00
corone17 bea41c7f3f Update rtlnl.py 
Better to extract 'http://manifest.us.rtl.nl' from the json, I'd say. And I think it's better to use the default json-url to make it more futureproof.
Succesfully tested with tarball.
 2015-06-29 00:59:18 +02:00
Anders Einar Hilden c4bd188da4 NRK now supports / requires HTTPS 
Add s? to regexp to support new urls. Update testcases to use HTTPS.
 2015-06-29 00:11:31 +02:00
Sergey M․ 5414623791 [extractor/common] Remove superfluous line 2015-06-29 00:49:19 +06:00
Sergey M․ c93d53f5e3 [youtube] Fix likes/dislike extraction 2015-06-29 00:48:06 +06:00
Sergey M․ d16154d163 [tnaflix] Generalize tnaflix extractors 2015-06-28 23:05:09 +06:00
Sergey M․ c342041fba [extractor/common] Use NO_DEFAULT from utils 2015-06-28 22:56:45 +06:00
Sergey M․ c7c040b825 Merge branch 'moviefap' of https://github.com/gebn/youtube-dl into gebn-moviefap 2015-06-28 18:00:49 +06:00
Yen Chi Hsuan ac0474f89d [twitch:vod] Update _TEST 
The original test case is gone
 2015-06-28 13:33:09 +08:00
Yen Chi Hsuan bb512e57dc [twitch:vod] Fix 'Source' format in m3u8 (closes #6115) 2015-06-28 13:33:09 +08:00
George Brighton db652ea186 [moviefap] Fix flake8 warnings introduced in 1a5fd4e 2015-06-27 23:04:55 +01:00
George Brighton 5a9cc19972 [moviefap] Move flv videos to formats in the metadata 2015-06-27 23:03:06 +01:00
George Brighton 1a5fd4eebc [moviefap] Wrap long lines 2015-06-27 22:32:56 +01:00
George Brighton 8a1b49ff19 [moviefap] Explicitly sort formats to handle possible site changes 2015-06-27 22:28:17 +01:00
George Brighton b971abe897 [moviefap] Replace call to str() with compat.compat_str() 2015-06-27 21:04:53 +01:00
George Brighton 43b925ce74 [moviefap] Replace calls to find() with util.xpath_text(). 2015-06-27 20:52:12 +01:00
George Brighton 62b742ece3 [moviefap] Remove redundant comments 2015-06-27 20:51:11 +01:00
George Brighton d16ef949ca [moviefap] Allow non-critical fields to change without breaking extraction 2015-06-27 20:36:46 +01:00
Sergey M․ 23e7cba87f [twitter:card] Add extractor (#5239) 2015-06-28 01:22:25 +06:00
George Brighton a8e6f30d8e [moviefap] Swap and justify tests 2015-06-27 20:16:53 +01:00
George Brighton 9c49410898 [moviefap] Add categories to tests 2015-06-27 20:16:53 +01:00
George Brighton 802d74aa6b [moviefap] Swap test for an alternative non-copyrighted video 2015-06-27 20:16:53 +01:00
George Brighton 71f9e49e67 [moviefap] Fix dictionary comprehension syntax incompatible with Python 2.6 2015-06-27 20:16:53 +01:00
George Brighton 82ea1051b5 [moviefap] Add new extractor 2015-06-27 20:16:53 +01:00
Sergey M․ 04c27802c0 [smotri] Add tests for password protected videos 2015-06-27 23:31:27 +06:00
Sergey M․ c3b7202f4f [smotri] Remove non relevant test 2015-06-27 23:03:26 +06:00
Sergey M․ 81103ef35d [smotri] Fix password protected video extraction 2015-06-27 23:00:27 +06:00
Sergey M. 0eb5c1c62a Merge pull request #6081 from yan12125/skip_problematic_sites 
[planetaplay/quickvid/vube] Skip inaccessible sites
 2015-06-27 18:49:29 +05:00
Sergey M․ a9de951744 [snagfilms] More tests 2015-06-27 18:57:01 +06:00
Sergey M․ a42a1bb09d [snagfilms] Capture not available error 2015-06-27 18:54:08 +06:00
Sergey M․ 9fbfc9bd4d [snagfilms:embed] Capture geolocation restriction error 2015-06-27 18:50:26 +06:00
Sergey M․ 242a998bdc [snagfilms] Add support for shows 2015-06-27 18:40:01 +06:00
Sergey M․ 9d1bf70234 Merge branch 'remitamine-snagfilms' 2015-06-27 18:29:16 +06:00
Sergey M․ b8c1cc1a51 [extractor/generic] Add test for snagfilms embeds 2015-06-27 18:28:10 +06:00
Sergey M․ eedd20ef96 [extractor/generic] Add support for snagfilms embeds 2015-06-27 18:26:14 +06:00
Sergey M․ 7c197ad96d [snagfilms] Add routine for generic embeds extractions 2015-06-27 18:25:50 +06:00
Sergey M․ 654fd03c73 [snagfilms] Improve and simplify 2015-06-27 18:20:42 +06:00
Jaime Marquínez Ferrándiz cee16e0fa3 [newstube] style: fix alignment 2015-06-27 14:20:33 +02:00
Jaime Marquínez Ferrándiz 73c471e9ef [newstube] Fix GUID extraction (fixes #6109) 2015-06-27 14:18:01 +02:00
Sergey M․ 533b99fbf9 Merge branch 'snagfilms' of https://github.com/remitamine/youtube-dl into remitamine-snagfilms 2015-06-27 16:52:51 +06:00
remitamine f39eb98bab download all pages before start extracting info 2015-06-27 10:55:25 +01:00
Sergey M․ da77d856a1 [youtube] Add test for #6093 2015-06-27 14:55:46 +06:00
Sergey M․ 0a3cf9ad3d [youtube] Skip get_video_info requests when --youtube-skip-dash-manifest is specified 2015-06-27 14:31:18 +06:00
Sergey M․ 226b886ca8 [vk] Fix authentication (Closes #6105) 2015-06-27 14:04:55 +06:00
Sergey M․ bc93bdb5bb [youtube] Fix reference before assignment for video_info 2015-06-27 13:19:46 +06:00
Yen Chi Hsuan af214c3a79 [youtube] More useful messages for georestricted videos (#5716) 2015-06-27 13:15:57 +08:00
remitamine 7d7d469025 add support for embed links 2015-06-27 00:13:14 +01:00
remitamine fd40bdc0be remove unnecessary symbolic name for group 2015-06-26 21:56:15 +01:00
remitamine 7e0480ae0e convert tabs to 4 spaces identation 2015-06-26 21:50:27 +01:00
Sergey M․ d80265ccd6 [youtube] Simplify non-DASH formats exclusion 2015-06-27 02:48:50 +06:00
Sergey M․ 1b5a1ae257 [youtube] Pick up codecs info from DASH manifest when not set explicitly 2015-06-27 00:41:26 +06:00
Sergey M․ d8d24a922a [youtube] Extract formats from multiple DASH manifests (Closes #6093) 
DASH manifest pointed by dashmpd from the video webpage and one pointed by get_video_info may
be different (namely different itag set) - some itags are missing from DASH manifest pointed by
webpage's dashmpd, some - from DASH manifest pointed by get_video_info's dashmpd).
The general idea is to take a union of itags of both DASH manifests (for example video with such
'manifest behavior' see https://github.com/rg3/youtube-dl/issues/6093).
 2015-06-27 00:36:23 +06:00
remitamine 03339b7b5b [snagfilms] Add new extractor 2015-06-26 18:25:43 +01:00
Shadab Zafar 2028c6e03d Added a Playlist Info Extractor for WebOfStories 2015-06-26 21:27:43 +05:30
Sergey M․ 2988835af5 [lynda] Fix non-ASCII logins/passwords on python 2 2015-06-26 19:48:23 +06:00
Sergey M․ 62cca96b72 [lynda] Fix confirm login request (#6088) 2015-06-26 19:46:42 +06:00
Sergey M․ b4dea075a3 [lynda] Fix login request (Closes #6088) 2015-06-26 19:36:04 +06:00
Sergey M․ 533f67d3fa [infoq] Relax _VALID_URL (Closes #6071) 2015-06-25 19:54:44 +06:00
Yen Chi Hsuan b8091db6b9 [planetaplay/quickvid/vube] Skip inaccessible sites 2015-06-25 16:40:29 +08:00
Yen Chi Hsuan 381c067755 [thesixtyone] Modernize 2015-06-25 16:19:04 +08:00
Yen Chi Hsuan 2182ab5187 [thesixtyone] Fix audio_server 
Some of the songs are moved to Amazon AWS
 2015-06-25 16:15:13 +08:00
fnord aa5740fb61 Merge remote-tracking branch 'origin/master' into pr-bbcnews 2015-06-25 00:34:46 -05:00