youtube-dl

commit 6609b3ce371d08c0464a3caa30c21b61de221508
parent 7e182627d9963b8c95faab2f2c6213d17a8db745
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sat,  9 Jan 2016 00:19:36 +0600

[xhamster] Improve title extraction

Diffstat:
M
youtube_dl/extractor/xhamster.py
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git 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'<title>(?P<title>.+?)(?:, (?:[^,]+? )?Porn: xHamster| - xHamster\.com)</title>',
-             r'<h1(?: itemprop="name")?>([^<]+)</h1>'], webpage, 'title')
+            [r'<title[^>]*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)</title>',
+             r'<h1[^>]*>([^<]+)</h1>',
+             r'<meta[^>]+itemprop=".*?caption.*?"[^>]+content="(.+?)"'], webpage, 'title')
 
         # Only a few videos have an description
         mobj = re.search(r'<span>Description: </span>([^<]+)', webpage)