From: Sergey M․ Date: Wed, 21 Jun 2017 17:20:45 +0000 (+0700) Subject: [youporn] Fix title extraction (closes #13456) X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=97b6e3011370a851b942bca144afb7cb08a57f5d;p=youtube-dl.git [youporn] Fix title extraction (closes #13456) --- diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index 34ab878a4..7bc2cefc7 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -68,9 +68,12 @@ class YouPornIE(InfoExtractor): webpage = self._download_webpage(request, display_id) title = self._search_regex( - [r'(?:video_titles|videoTitle)\s*[:=]\s*(["\'])(?P.+?)\1', - r'<h1[^>]+class=["\']heading\d?["\'][^>]*>([^<])<'], - webpage, 'title', group='title') + [r'(?:video_titles|videoTitle|title)\s*[:=]\s*(["\'])(?P<title>(?:(?!\1).)+)\1', + r'<h1[^>]+class=["\']heading\d?["\'][^>]*>(?P<title>[^<]+)<'], + webpage, 'title', group='title', + default=None) or self._og_search_title( + webpage, default=None) or self._html_search_meta( + 'title', webpage, fatal=True) links = []