From: Sergey M․ Date: Fri, 8 Jan 2016 18:31:24 +0000 (+0600) Subject: [xhamster] Change title regex precedence X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=1a6d92847f4e5fe1d94f2f159f903a414d5ff62c;p=youtube-dl [xhamster] Change title regex precedence --- diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index ccee77359..c9108c345 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -64,9 +64,10 @@ class XHamsterIE(InfoExtractor): webpage = self._download_webpage(mrss_url, video_id) title = self._html_search_regex( - [r']*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)', - r']*>([^<]+)', - r']+itemprop=".*?caption.*?"[^>]+content="(.+?)"'], webpage, 'title') + [r']*>([^<]+)', + r']+itemprop=".*?caption.*?"[^>]+content="(.+?)"', + r']*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)'], + webpage, 'title') # Only a few videos have an description mobj = re.search(r'Description: ([^<]+)', webpage)