projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e18262
)
[xhamster] Improve title extraction
author
Sergey M․
<dstftw@gmail.com>
Fri, 8 Jan 2016 18:19:36 +0000
(
00:19
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 8 Jan 2016 18:19:36 +0000
(
00:19
+0600)
youtube_dl/extractor/xhamster.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/xhamster.py
b/youtube_dl/extractor/xhamster.py
index 261d323a7dc5cbbfe8eb6cd6890504df7bfbaab4..97355d17fbfbacefa27a48940aae25d15770cea3 100644
(file)
--- 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(
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)
# Only a few videos have an description
mobj = re.search(r'<span>Description: </span>([^<]+)', webpage)