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