aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/vporn.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-04-30 21:31:38 +0600
committerSergey M․ <dstftw@gmail.com>2015-04-30 21:31:38 +0600
commit7a03280df4555998fc99399907062b62383db2c4 (patch)
tree5d84ac93def61c519845be3a1dc964a97cbd4232 /youtube_dl/extractor/vporn.py
parentcd298882cd6f8ed2571dd372f684ec17e992fd9d (diff)
downloadyoutube-dl-7a03280df4555998fc99399907062b62383db2c4.tar.xz
[vporn] More metadata extraction fixes and tests update (#5560)
Diffstat (limited to 'youtube_dl/extractor/vporn.py')
-rw-r--r--youtube_dl/extractor/vporn.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/youtube_dl/extractor/vporn.py b/youtube_dl/extractor/vporn.py
index 04ed0b381..92c90e517 100644
--- a/youtube_dl/extractor/vporn.py
+++ b/youtube_dl/extractor/vporn.py
@@ -27,9 +27,6 @@ class VpornIE(InfoExtractor):
'duration': 393,
'age_limit': 18,
'view_count': int,
- 'like_count': int,
- 'dislike_count': int,
- 'comment_count': int,
}
},
{
@@ -47,9 +44,6 @@ class VpornIE(InfoExtractor):
'duration': 588,
'age_limit': 18,
'view_count': int,
- 'like_count': int,
- 'dislike_count': int,
- 'comment_count': int,
}
},
]
@@ -72,10 +66,10 @@ class VpornIE(InfoExtractor):
thumbnail = 'http://www.vporn.com' + thumbnail
uploader = self._html_search_regex(
- r'(?s)Uploaded by:.*?<a href="/user/[^"]+">([^<]+)</a>',
+ r'(?s)Uploaded by:.*?<a href="/user/[^"]+"[^>]*>(.+?)</a>',
webpage, 'uploader', fatal=False)
- categories = re.findall(r'<a href="/cat/[^"]+">([^<]+)</a>', webpage)
+ categories = re.findall(r'<a href="/cat/[^"]+"[^>]*>([^<]+)</a>', webpage)
duration = parse_duration(self._search_regex(
r'Runtime:\s*</span>\s*(\d+ min \d+ sec)',