From 748df3d606dddf9f80c767a285e4894f55398e2f Mon Sep 17 00:00:00 2001 From: Kevin Laube Date: Mon, 13 Jan 2020 09:58:15 +0100 Subject: [PATCH] added test case; fixed upload date extraction regex --- youtube_dl/extractor/youporn.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index 3c4e579ca..425d70f2f 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -57,7 +57,27 @@ class YouPornIE(InfoExtractor): 'params': { 'skip_download': True, }, - }] + }, { + # the source urls in the "formats" array of newer videos might have a new format + 'url': 'https://www.youporn.com/watch/15573378/visit-x-unschuldiges-deutsches-luder-bekommt-hintern-versohlen/', + 'md5': '3744d24c50438cf5b6f6d59feb5055c2', + 'info_dict': { + 'id': '15573378', + 'display_id': 'visit-x-unschuldiges-deutsches-luder-bekommt-hintern-versohlen', + 'ext': 'mp4', + 'title': 'VISIT-X | Unschuldiges deutsches Luder bekommt Hintern versohlen', + 'description': 'Watch VISIT-X | Unschuldiges deutsches Luder bekommt Hintern versohlen online on YouPorn.com. YouPorn is the largest Blowjob porn video site with the hottest selection of free, high quality german movies. Enjoy our HD porno videos on any device of your choosing!', + 'thumbnail': r're:^https?://.*\.jpg$', + 'uploader': 'Visit-X', + 'upload_date': '20190910', + 'average_rating': int, + 'view_count': int, + 'comment_count': int, + 'categories': list, + 'tags': list, + 'age_limit': 18, + }, + }] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) @@ -147,7 +167,7 @@ class YouPornIE(InfoExtractor): webpage, 'uploader', fatal=False) upload_date = unified_strdate(self._html_search_regex( [r'Date\s+[Aa]dded:\s*([^<]+)', - r'(?s)]+class=["\']videoInfo(?:Date|Time)["\'][^>]*>(.+?)'], + r'(?s)]+class=["\']video-uploaded["\'][^>]*>[^<]+?([^<]+)'], webpage, 'upload date', fatal=False)) age_limit = self._rta_search(webpage)