From: Sergey M․ Date: Sat, 11 Jun 2016 21:49:37 +0000 (+0700) Subject: [youporn] Fix metadata extraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=2c3322e36ef23eb0566b820dd8e8711de20ed963;p=youtube-dl [youporn] Fix metadata extraction --- diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index 1124fe6c2..0df2d76ee 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -17,7 +17,7 @@ class YouPornIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?youporn\.com/watch/(?P\d+)/(?P[^/?#&]+)' _TESTS = [{ 'url': 'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/', - 'md5': '71ec5fcfddacf80f495efa8b6a8d9a89', + 'md5': '3744d24c50438cf5b6f6d59feb5055c2', 'info_dict': { 'id': '505835', 'display_id': 'sex-ed-is-it-safe-to-masturbate-daily', @@ -121,21 +121,21 @@ class YouPornIE(InfoExtractor): webpage, 'thumbnail', fatal=False, group='thumbnail') uploader = self._html_search_regex( - r'(?s)]+class=["\']videoInfoBy(?:\s+[^"\']+)?["\'][^>]*>\s*By:\s*(.+?)', + r'(?s)]+class=["\']submitByLink["\'][^>]*>(.+?)', webpage, 'uploader', fatal=False) upload_date = unified_strdate(self._html_search_regex( - r'(?s)]+class=["\']videoInfoTime["\'][^>]*>(.+?)', + r'(?s)]+class=["\']videoInfo(?:Date|Time)["\'][^>]*>(.+?)', webpage, 'upload date', fatal=False)) age_limit = self._rta_search(webpage) average_rating = int_or_none(self._search_regex( - r']+class=["\']videoInfoRating["\'][^>]*>\s*]+class=["\']videoRatingPercentage["\'][^>]*>(\d+)%', + r']+class=["\']videoRatingPercentage["\'][^>]*>(\d+)%', webpage, 'average rating', fatal=False)) view_count = str_to_int(self._search_regex( - r'(?s)]+class=["\']videoInfoViews["\'][^>]*>.*?([\d,.]+)\s*', - webpage, 'view count', fatal=False)) + r'(?s)]+class=(["\']).*?\bvideoInfoViews\b.*?\1[^>]*>.*?(?P[\d,.]+)<', + webpage, 'view count', fatal=False, group='count')) comment_count = str_to_int(self._search_regex( r'>All [Cc]omments? \(([\d,.]+)\)', webpage, 'comment count', fatal=False))