X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fxhamster.py;h=b3547174dd92beffafaf8f220b50b94a25f2fa2b;hb=452908b257da1a5b228a2c0522c89fff87296622;hp=2b9ac2419a690385cee3ea50432d0cbf191d0d5e;hpb=44731e308cdcc89fda1e613e094aa23de33f5c9e;p=youtube-dl.git
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index 2b9ac2419..b3547174d 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -4,9 +4,9 @@ import re
from .common import InfoExtractor
from ..utils import (
+ dict_get,
float_or_none,
int_or_none,
- str_to_int,
unified_strdate,
)
@@ -22,7 +22,7 @@ class XHamsterIE(InfoExtractor):
'title': 'FemaleAgent Shy beauty takes the bait',
'upload_date': '20121014',
'uploader': 'Ruseful2011',
- 'duration': 893,
+ 'duration': 893.52,
'age_limit': 18,
}
},
@@ -34,7 +34,7 @@ class XHamsterIE(InfoExtractor):
'title': 'Britney Spears Sexy Booty',
'upload_date': '20130914',
'uploader': 'jojo747400',
- 'duration': 200,
+ 'duration': 200.48,
'age_limit': 18,
}
},
@@ -64,9 +64,10 @@ class XHamsterIE(InfoExtractor):
webpage = self._download_webpage(mrss_url, video_id)
title = self._html_search_regex(
- [r'
]*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)',
- r']*>([^<]+)
',
- r']+itemprop=".*?caption.*?"[^>]+content="(.+?)"'], webpage, 'title')
+ [r']*>([^<]+)
',
+ r']+itemprop=".*?caption.*?"[^>]+content="(.+?)"',
+ r']*>(.+?)(?:,\s*[^,]*?\s*Porn\s*[^,]*?:\s*xHamster[^<]*| - xHamster\.com)'],
+ webpage, 'title')
# Only a few videos have an description
mobj = re.search(r'Description: ([^<]+)', webpage)
@@ -77,7 +78,7 @@ class XHamsterIE(InfoExtractor):
webpage, 'upload date', fatal=False))
uploader = self._html_search_regex(
- r"]+>(?P[^<]+)",
+ r']+itemprop=["\']author[^>]+>]+href=["\'].+?xhamster\.com/user/[^>]+>(?P.+?)',
webpage, 'uploader', default='anonymous')
thumbnail = self._search_regex(
@@ -89,9 +90,9 @@ class XHamsterIE(InfoExtractor):
r'(["\'])duration\1\s*:\s*(["\'])(?P.+?)\2',
webpage, 'duration', fatal=False, group='duration'))
- view_count = self._html_search_regex(r'Views: ([^<]+)', webpage, 'view count', fatal=False)
- if view_count:
- view_count = str_to_int(view_count)
+ view_count = int_or_none(self._search_regex(
+ r'content=["\']User(?:View|Play)s:(\d+)',
+ webpage, 'view count', fatal=False))
mobj = re.search(r"hint='(?P\d+) Likes / (?P\d+) Dislikes'", webpage)
(like_count, dislike_count) = (mobj.group('likecount'), mobj.group('dislikecount')) if mobj else (None, None)
@@ -170,6 +171,12 @@ class XHamsterEmbedIE(InfoExtractor):
video_url = self._search_regex(
r'href="(https?://xhamster\.com/movies/%s/[^"]+\.html[^"]*)"' % video_id,
- webpage, 'xhamster url')
+ webpage, 'xhamster url', default=None)
+
+ if not video_url:
+ vars = self._parse_json(
+ self._search_regex(r'vars\s*:\s*({.+?})\s*,\s*\n', webpage, 'vars'),
+ video_id)
+ video_url = dict_get(vars, ('downloadLink', 'homepageLink', 'commentsLink', 'shareUrl'))
return self.url_result(video_url, 'XHamster')