From: Sergey M․ Date: Sun, 28 Jun 2015 18:48:06 +0000 (+0600) Subject: [youtube] Fix likes/dislike extraction X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=c93d53f5e307dab1b5d03cd3c621a68f40ef840d;p=youtube-dl.git [youtube] Fix likes/dislike extraction --- diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index d9240ff02..8b43e274b 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -29,6 +29,7 @@ from ..utils import ( get_element_by_id, int_or_none, orderedSet, + str_to_int, unescapeHTML, unified_strdate, uppercase_escape, @@ -1005,12 +1006,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor): video_description = '' def _extract_count(count_name): - count = self._search_regex( - r'id="watch-%s"[^>]*>.*?([\d,]+)\s*' % re.escape(count_name), - video_webpage, count_name, default=None) - if count is not None: - return int(count.replace(',', '')) - return None + return str_to_int(self._search_regex( + r'-%s-button[^>]+>]+class="yt-uix-button-content"[^>]*>([\d,]+)' + % re.escape(count_name), + video_webpage, count_name, default=None)) + like_count = _extract_count('like') dislike_count = _extract_count('dislike')