Browse Source

[eporner] Fix duration (Closes #4188)

totalwebcasting
Philipp Hagemeister 10 years ago
parent
commit
6a68bb574a
3 changed files with 9 additions and 5 deletions
  1. +1
    -0
      test/test_utils.py
  2. +2
    -4
      youtube_dl/extractor/eporner.py
  3. +6
    -1
      youtube_dl/utils.py

+ 1
- 0
test/test_utils.py View File

@ -218,6 +218,7 @@ class TestUtil(unittest.TestCase):
self.assertEqual(parse_duration('0m0s'), 0)
self.assertEqual(parse_duration('0s'), 0)
self.assertEqual(parse_duration('01:02:03.05'), 3723.05)
self.assertEqual(parse_duration('T30M38S'), 1838)
def test_fix_xml_ampersands(self):
self.assertEqual(


+ 2
- 4
youtube_dl/extractor/eporner.py View File

@ -20,7 +20,7 @@ class EpornerIE(InfoExtractor):
'display_id': 'Infamous-Tiffany-Teen-Strip-Tease-Video',
'ext': 'mp4',
'title': 'Infamous Tiffany Teen Strip Tease Video',
'duration': 194,
'duration': 1838,
'view_count': int,
'age_limit': 18,
}
@ -57,9 +57,7 @@ class EpornerIE(InfoExtractor):
formats.append(fmt)
self._sort_formats(formats)
duration = parse_duration(self._search_regex(
r'class="mbtim">([0-9:]+)</div>', webpage, 'duration',
fatal=False))
duration = parse_duration(self._html_search_meta('duration', webpage))
view_count = str_to_int(self._search_regex(
r'id="cinemaviews">\s*([0-9,]+)\s*<small>views',
webpage, 'view count', fatal=False))


+ 6
- 1
youtube_dl/utils.py View File

@ -1115,7 +1115,12 @@ def parse_duration(s):
s = s.strip()
m = re.match(
r'(?i)(?:(?:(?P<hours>[0-9]+)\s*(?:[:h]|hours?)\s*)?(?P<mins>[0-9]+)\s*(?:[:m]|mins?|minutes?)\s*)?(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*(?:s|secs?|seconds?)?$', s)
r'''(?ix)T?
(?:
(?:(?P<hours>[0-9]+)\s*(?:[:h]|hours?)\s*)?
(?P<mins>[0-9]+)\s*(?:[:m]|mins?|minutes?)\s*
)?
(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*(?:s|secs?|seconds?)?$''', s)
if not m:
return None
res = int(m.group('secs'))


Loading…
Cancel
Save