w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[xhamster] Fix duration extraction (closes #11549)

Browse source
This commit is contained in:
Sergey M․ 2016-12-28 23:01:52 +07:00
parent b63005f5af
commit 51378d359e
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/xhamster.py
View file

@ -5,8 +5,8 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
dict_get, dict_get,
float_or_none,
int_or_none, int_or_none,
parse_duration,
unified_strdate, unified_strdate,
) )
@ -22,7 +22,7 @@ class XHamsterIE(InfoExtractor):
'title': 'FemaleAgent Shy beauty takes the bait', 'title': 'FemaleAgent Shy beauty takes the bait',
'upload_date': '20121014', 'upload_date': '20121014',
'uploader': 'Ruseful2011', 'uploader': 'Ruseful2011',
'duration': 893.52, 'duration': 893,
'age_limit': 18, 'age_limit': 18,
}, },
}, { }, {
@ -33,7 +33,7 @@ class XHamsterIE(InfoExtractor):
'title': 'Britney Spears Sexy Booty', 'title': 'Britney Spears Sexy Booty',
'upload_date': '20130914', 'upload_date': '20130914',
'uploader': 'jojo747400', 'uploader': 'jojo747400',
'duration': 200.48, 'duration': 200,
'age_limit': 18, 'age_limit': 18,
}, },
'params': { 'params': {
@ -48,7 +48,7 @@ class XHamsterIE(InfoExtractor):
'title': '....', 'title': '....',
'upload_date': '20160208', 'upload_date': '20160208',
'uploader': 'parejafree', 'uploader': 'parejafree',
'duration': 72.0, 'duration': 72,
'age_limit': 18, 'age_limit': 18,
}, },
'params': { 'params': {
@ -101,9 +101,9 @@ class XHamsterIE(InfoExtractor):
r'''<video[^>]+poster=(?P<q>["'])(?P<thumbnail>.+?)(?P=q)[^>]*>'''], r'''<video[^>]+poster=(?P<q>["'])(?P<thumbnail>.+?)(?P=q)[^>]*>'''],
webpage, 'thumbnail', fatal=False, group='thumbnail') webpage, 'thumbnail', fatal=False, group='thumbnail')
duration = float_or_none(self._search_regex( duration = parse_duration(self._search_regex(
r'(["\'])duration\1\s*:\s*(["\'])(?P<duration>.+?)\2', r'Runtime:\s*</span>\s*([\d:]+)', webpage,
webpage, 'duration', fatal=False, group='duration')) 'duration', fatal=False))
view_count = int_or_none(self._search_regex( view_count = int_or_none(self._search_regex(
r'content=["\']User(?:View|Play)s:(\d+)', r'content=["\']User(?:View|Play)s:(\d+)',