aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-09-24 19:56:54 +0600
committerSergey M․ <dstftw@gmail.com>2015-09-24 19:56:54 +0600
commit4395ca2e04f38c110259270fa4dfc4d9814aa926 (patch)
tree8415b0104eee647d2a80766cb73abb8724c6ee6e /youtube_dl/extractor
parent19f93d906e29e9a505d4bf5d286d75224c342c37 (diff)
[xhamster] Fix title extraction (Closes #6944)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/xhamster.py4
1 files changed, 3 insertions, 1 deletions
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'<title>(?P<title>.+?) - xHamster\.com</title>', webpage, 'title')
+ title = self._html_search_regex(
+ [r'<title>(?P<title>.+?)(?:, Free Porn: xHamster| - xHamster\.com)</title>',
+ r'<h1>([^<]+)</h1>'], webpage, 'title')
# Only a few videos have an description
mobj = re.search(r'<span>Description: </span>([^<]+)', webpage)