From: Sergey M․ Date: Thu, 24 Sep 2015 13:56:54 +0000 (+0600) Subject: [xhamster] Fix title extraction (Closes #6944) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4395ca2e04f38c110259270fa4dfc4d9814aa926;p=youtube-dl [xhamster] Fix title extraction (Closes #6944) --- diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 97315750f..f12fe13b1 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -63,7 +63,9 @@ class XHamsterIE(InfoExtractor): mrss_url = '%s://xhamster.com/movies/%s/%s.html' % (proto, video_id, seo) webpage = self._download_webpage(mrss_url, video_id) - title = self._html_search_regex(r'(?P<title>.+?) - xHamster\.com', webpage, 'title') + title = self._html_search_regex( + [r'(?P<title>.+?)(?:, Free Porn: xHamster| - xHamster\.com)', + r'

([^<]+)

'], webpage, 'title') # Only a few videos have an description mobj = re.search(r'Description: ([^<]+)', webpage)