commit: 1a6d92847f4e5fe1d94f2f159f903a414d5ff62c
parent 6a16fd4a1ad1dbd9372f75ddffce1e9fe95b002c
Author: Sergey M․ <dstftw@gmail.com>
Date: Sat, 9 Jan 2016 00:31:24 +0600
[xhamster] Change title regex precedence
Diffstat:
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git 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'<title[^>]*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)</title>',
- r'<h1[^>]*>([^<]+)</h1>',
- r'<meta[^>]+itemprop=".*?caption.*?"[^>]+content="(.+?)"'], webpage, 'title')
+ [r'<h1[^>]*>([^<]+)</h1>',
+ r'<meta[^>]+itemprop=".*?caption.*?"[^>]+content="(.+?)"',
+ r'<title[^>]*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)</title>'],
+ webpage, 'title')
# Only a few videos have an description
mobj = re.search(r'<span>Description: </span>([^<]+)', webpage)