From ec4161a57d66c92ea7460ac44dda13aadfb85f21 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 30 Jan 2015 03:06:51 +0100 Subject: [PATCH] [ctsnews] Remove news count check (#4802) That's the number of articles (or at least some constant value); view count is the number of views of the video! Also add a better description so that we can distinguish the two downloads. --- youtube_dl/extractor/ctsnews.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/youtube_dl/extractor/ctsnews.py b/youtube_dl/extractor/ctsnews.py index 35f3756f5b..f769dc0312 100644 --- a/youtube_dl/extractor/ctsnews.py +++ b/youtube_dl/extractor/ctsnews.py @@ -58,7 +58,8 @@ class CtsNewsIE(InfoExtractor): feed_url = self._html_search_regex( r'(http://news\.cts\.com\.tw/action/mp4feed\.php\?news_id=\d+)', page, 'feed url') - video_url = self._download_webpage(feed_url, news_id) + video_url = self._download_webpage( + feed_url, news_id, note='Fetching feed') else: self.to_screen('Not CTSPlayer video, trying Youtube...') youtube_url = self._search_regex( @@ -83,14 +84,6 @@ class CtsNewsIE(InfoExtractor): datetime_str = datetime_str.replace('/', '-') + ':00+0800' timestamp = parse_iso8601(datetime_str, delimiter=' ') - # Note: the news count may decrease as time goes by - # It should be a bug in CTS website - req = compat_urllib_request.Request( - 'http://news.cts.com.tw/action/news_count.php?callback=cb&news_id=' + news_id) - req.add_header('Referer', url) - newscount_page = self._download_webpage(req, news_id) - news_count = self._search_regex(r'cb\((\d+)\)', newscount_page, 'news count') - return { 'id': news_id, 'url': video_url, @@ -98,5 +91,4 @@ class CtsNewsIE(InfoExtractor): 'description': description, 'thumbnail': thumbnail, 'timestamp': timestamp, - 'view_count': news_count, }