Merge pull request #6955 from atomic83/patch-1
authorSergey M. <dstftw@gmail.com>
Thu, 24 Sep 2015 22:26:07 +0000 (04:26 +0600)
committerSergey M. <dstftw@gmail.com>
Thu, 24 Sep 2015 22:26:07 +0000 (04:26 +0600)
More title extraction fixing.

youtube_dl/extractor/xhamster.py

index f12fe13b11eef4cc0080a1fd1bd3ade82ca62c0a..8938c0e4561d2c6163158e409106dd2e928e85bf 100644 (file)
@@ -64,7 +64,7 @@ class XHamsterIE(InfoExtractor):
         webpage = self._download_webpage(mrss_url, video_id)
 
         title = self._html_search_regex(
-            [r'<title>(?P<title>.+?)(?:, Free Porn: xHamster| - xHamster\.com)</title>',
+            [r'<title>(?P<title>.+?)(?:, (?:[^,]+? )?Porn: xHamster| - xHamster\.com)</title>',
              r'<h1>([^<]+)</h1>'], webpage, 'title')
 
         # Only a few videos have an description