projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
19f93d9
)
[xhamster] Fix title extraction (Closes #6944)
author
Sergey M․
<dstftw@gmail.com>
Thu, 24 Sep 2015 13:56:54 +0000
(19:56 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 24 Sep 2015 13:56:54 +0000
(19:56 +0600)
youtube_dl/extractor/xhamster.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/xhamster.py
b/youtube_dl/extractor/xhamster.py
index 97315750fd59198022a72eca53482efdd8d98e75..f12fe13b11eef4cc0080a1fd1bd3ade82ca62c0a 100644
(file)
--- 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)
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)
# Only a few videos have an description
mobj = re.search(r'<span>Description: </span>([^<]+)', webpage)