projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78e210d
)
[xhamster] Simplify (closes #13216)
author
Sergey M․
<dstftw@gmail.com>
Sun, 28 May 2017 00:55:56 +0000
(07:55 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 28 May 2017 00:55:56 +0000
(07:55 +0700)
youtube_dl/extractor/xhamster.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/xhamster.py
b/youtube_dl/extractor/xhamster.py
index ae0c167c4863e5ddfeaabfb27d02a002a5aa6a30..6987b2e3a41754bff8d2ec61729b8a77b6a919cd 100644
(file)
--- a/
youtube_dl/extractor/xhamster.py
+++ b/
youtube_dl/extractor/xhamster.py
@@
-108,7
+108,7
@@
class XHamsterIE(InfoExtractor):
webpage, 'upload date', fatal=False))
uploader = self._html_search_regex(
webpage, 'upload date', fatal=False))
uploader = self._html_search_regex(
- r'<span[^>]+
?itemprop=["\']author[^>]+?><a[^>]+?href=["\'][^>]+?><span[^>]+?itemprop=["\']name[^>]+?>(.+?)</span
',
+ r'<span[^>]+
itemprop=["\']author[^>]+><a[^>]+><span[^>]+>([^<]+)
',
webpage, 'uploader', default='anonymous')
thumbnail = self._search_regex(
webpage, 'uploader', default='anonymous')
thumbnail = self._search_regex(
@@
-124,7
+124,7
@@
class XHamsterIE(InfoExtractor):
r'content=["\']User(?:View|Play)s:(\d+)',
webpage, 'view count', fatal=False))
r'content=["\']User(?:View|Play)s:(\d+)',
webpage, 'view count', fatal=False))
- mobj = re.search(r'hint=[\'"](?P<likecount>\d+) Likes / (?P<dislikecount>\d+) Dislikes
[\'"]
', webpage)
+ mobj = re.search(r'hint=[\'"](?P<likecount>\d+) Likes / (?P<dislikecount>\d+) Dislikes', webpage)
(like_count, dislike_count) = (mobj.group('likecount'), mobj.group('dislikecount')) if mobj else (None, None)
mobj = re.search(r'</label>Comments \((?P<commentcount>\d+)\)</div>', webpage)
(like_count, dislike_count) = (mobj.group('likecount'), mobj.group('dislikecount')) if mobj else (None, None)
mobj = re.search(r'</label>Comments \((?P<commentcount>\d+)\)</div>', webpage)