X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fvporn.py;h=92c90e5172e89b98c3309bb01dc9787f15c24859;hb=363cf58645d021810b7fd579084de07471407ae3;hp=2d23effccdff0ba49ff628ded1f72d044fe609d6;hpb=59d284c3161797e31d7ca36da71464696adb8620;p=youtube-dl.git
diff --git a/youtube_dl/extractor/vporn.py b/youtube_dl/extractor/vporn.py
index 2d23effcc..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,
}
},
]
@@ -64,29 +58,29 @@ class VpornIE(InfoExtractor):
title = self._html_search_regex(
r'videoname\s*=\s*\'([^\']+)\'', webpage, 'title').strip()
description = self._html_search_regex(
- r'
(.*?)
', webpage, 'description', fatal=False)
+ r'class="(?:descr|description_txt)">(.*?)',
+ webpage, 'description', fatal=False)
thumbnail = self._html_search_regex(
r'flashvars\.imageUrl\s*=\s*"([^"]+)"', webpage, 'description', fatal=False, default=None)
if thumbnail:
thumbnail = 'http://www.vporn.com' + thumbnail
uploader = self._html_search_regex(
- r'(?s)UPLOADED BY.*?([^<]+)',
+ r'(?s)Uploaded by:.*?]*>(.+?)',
webpage, 'uploader', fatal=False)
- categories = re.findall(r'([^<]+)', webpage)
+ categories = re.findall(r']*>([^<]+)', webpage)
duration = parse_duration(self._search_regex(
- r'duration (\d+ min \d+ sec)', webpage, 'duration', fatal=False))
+ r'Runtime:\s*\s*(\d+ min \d+ sec)',
+ webpage, 'duration', fatal=False))
- view_count = str_to_int(self._html_search_regex(
- r'([\d,\.]+) VIEWS', webpage, 'view count', fatal=False))
- like_count = str_to_int(self._html_search_regex(
- r'([\d,\.]+)', webpage, 'like count', fatal=False))
- dislike_count = str_to_int(self._html_search_regex(
- r'([\d,\.]+)', webpage, 'dislike count', fatal=False))
+ view_count = str_to_int(self._search_regex(
+ r'class="views">([\d,\.]+) [Vv]iews<',
+ webpage, 'view count', fatal=False))
comment_count = str_to_int(self._html_search_regex(
- r'Comments \(([\d,\.]+)\)
', webpage, 'comment count', fatal=False))
+ r"'Comments \(([\d,\.]+)\)'",
+ webpage, 'comment count', default=None))
formats = []
@@ -117,8 +111,6 @@ class VpornIE(InfoExtractor):
'categories': categories,
'duration': duration,
'view_count': view_count,
- 'like_count': like_count,
- 'dislike_count': dislike_count,
'comment_count': comment_count,
'age_limit': 18,
'formats': formats,