aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-12-28 23:01:52 +0700
committerSergey M․ <dstftw@gmail.com>2016-12-28 23:04:46 +0700
commit51378d359e790b1c4462c0577fa48dda97dc4c01 (patch)
tree893a263e9abd6820c78b977b4b23be02dbcd5227
parentb63005f5afb164f8660c23ab62962287eb1e1c16 (diff)
[xhamster] Fix duration extraction (closes #11549)
-rw-r--r--youtube_dl/extractor/xhamster.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index bd8e1af2e..36a8c9840 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -5,8 +5,8 @@ import re
from .common import InfoExtractor
from ..utils import (
dict_get,
- float_or_none,
int_or_none,
+ parse_duration,
unified_strdate,
)
@@ -22,7 +22,7 @@ class XHamsterIE(InfoExtractor):
'title': 'FemaleAgent Shy beauty takes the bait',
'upload_date': '20121014',
'uploader': 'Ruseful2011',
- 'duration': 893.52,
+ 'duration': 893,
'age_limit': 18,
},
}, {
@@ -33,7 +33,7 @@ class XHamsterIE(InfoExtractor):
'title': 'Britney Spears Sexy Booty',
'upload_date': '20130914',
'uploader': 'jojo747400',
- 'duration': 200.48,
+ 'duration': 200,
'age_limit': 18,
},
'params': {
@@ -48,7 +48,7 @@ class XHamsterIE(InfoExtractor):
'title': '....',
'upload_date': '20160208',
'uploader': 'parejafree',
- 'duration': 72.0,
+ 'duration': 72,
'age_limit': 18,
},
'params': {
@@ -101,9 +101,9 @@ class XHamsterIE(InfoExtractor):
r'''<video[^>]+poster=(?P<q>["'])(?P<thumbnail>.+?)(?P=q)[^>]*>'''],
webpage, 'thumbnail', fatal=False, group='thumbnail')
- duration = float_or_none(self._search_regex(
- r'(["\'])duration\1\s*:\s*(["\'])(?P<duration>.+?)\2',
- webpage, 'duration', fatal=False, group='duration'))
+ duration = parse_duration(self._search_regex(
+ r'Runtime:\s*</span>\s*([\d:]+)', webpage,
+ 'duration', fatal=False))
view_count = int_or_none(self._search_regex(
r'content=["\']User(?:View|Play)s:(\d+)',