X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fxhamster.py;h=97355d17fbfbacefa27a48940aae25d15770cea3;hb=6609b3ce371d08c0464a3caa30c21b61de221508;hp=8938c0e4561d2c6163158e409106dd2e928e85bf;hpb=545a23f11bbdf27d6d204225c578512af7184e0b;p=youtube-dl diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 8938c0e45..97355d17f 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -64,8 +64,9 @@ class XHamsterIE(InfoExtractor): webpage = self._download_webpage(mrss_url, video_id) title = self._html_search_regex( - [r'(?P<title>.+?)(?:, (?:[^,]+? )?Porn: xHamster| - xHamster\.com)', - r'

([^<]+)

'], webpage, 'title') + [r']*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)', + r']*>([^<]+)', + r']+itemprop=".*?caption.*?"[^>]+content="(.+?)"'], webpage, 'title') # Only a few videos have an description mobj = re.search(r'Description: ([^<]+)', webpage)