Browse Source

[xhamster] Fix duration extraction (closes #11549)

Sergey M․ 8 years ago
parent
commit
51378d359e
1 changed files with 7 additions and 7 deletions
  1. 7 7
      youtube_dl/extractor/xhamster.py

+ 7 - 7
youtube_dl/extractor/xhamster.py

@@ -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(
-            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(
         view_count = int_or_none(self._search_regex(
             r'content=["\']User(?:View|Play)s:(\d+)',
             r'content=["\']User(?:View|Play)s:(\d+)',