X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fninegag.py;h=c2e7b67c7e5334c4f906c6a93387d18170a03c26;hb=ad3bc6acd5d6724875b9fa59f9b5cdb9b904ec91;hp=3352b833018315821d5964c8e3c907ceb362e21c;hpb=77477fa4c916599e7eaa236a3f3eb5703923cf91;p=youtube-dl diff --git a/youtube_dl/extractor/ninegag.py b/youtube_dl/extractor/ninegag.py index 3352b8330..c2e7b67c7 100644 --- a/youtube_dl/extractor/ninegag.py +++ b/youtube_dl/extractor/ninegag.py @@ -1,8 +1,10 @@ from __future__ import unicode_literals import re +import json from .common import InfoExtractor +from ..utils import str_to_int class NineGagIE(InfoExtractor): @@ -44,23 +46,14 @@ class NineGagIE(InfoExtractor): webpage = self._download_webpage(url, display_id) - youtube_id = self._html_search_regex( - r'(?s)id="jsid-video-post-container".*?data-external-id="([^"]+)"', - webpage, 'video ID') - title = self._html_search_regex( - r'(?s)id="jsid-video-post-container".*?data-title="([^"]+)"', - webpage, 'title', default=None) - if not title: - title = self._og_search_title(webpage) - description = self._html_search_regex( - r'(?s)
(.*?)
', webpage, - 'description', fatal=False) - view_count_str = self._html_search_regex( - r'([0-9][0-9,]*) views
', webpage, 'view count', - fatal=False) - view_count = ( - None if view_count_str is None - else int(view_count_str.replace(',', ''))) + post_view = json.loads(self._html_search_regex( + r'var postView = new app\.PostView\({\s*post:\s*({.+?}),', webpage, 'post view')) + + youtube_id = post_view['videoExternalId'] + title = post_view['title'] + description = post_view['description'] + view_count = str_to_int(post_view['externalView']) + thumbnail = post_view.get('thumbnail_700w') or post_view.get('ogImageUrl') or post_view.get('thumbnail_300w') return { '_type': 'url_transparent', @@ -71,5 +64,5 @@ class NineGagIE(InfoExtractor): 'title': title, 'description': description, 'view_count': view_count, - 'thumbnail': self._og_search_thumbnail(webpage), + 'thumbnail': thumbnail, }