From 4c226a581fb17f89da9d083cfc1d5e4ac567588b Mon Sep 17 00:00:00 2001 From: Forthrin Date: Wed, 10 Apr 2019 19:01:17 +0200 Subject: [PATCH] [nrk] Gracefully handle subtitle thousands with less than three digits --- test/test_utils.py | 2 ++ youtube_dl/utils.py | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test_utils.py b/test/test_utils.py index ca6d832a4..9fb5ae431 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1154,6 +1154,8 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4') self.assertEqual(parse_dfxp_time_expr('00:00:01'), 1.0) self.assertEqual(parse_dfxp_time_expr('00:00:01.100'), 1.1) self.assertEqual(parse_dfxp_time_expr('00:00:01:100'), 1.1) + self.assertEqual(parse_dfxp_time_expr('00:00:01:10'), 1.01) # [nrk] + self.assertEqual(parse_dfxp_time_expr('00:00:01:1'), 1.001) # [nrk] def test_dfxp2srt(self): dfxp_data = ''' diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 71713f63a..3d74c0d49 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -2729,9 +2729,13 @@ def parse_dfxp_time_expr(time_expr): if mobj: return float(mobj.group('time_offset')) - mobj = re.match(r'^(\d+):(\d\d):(\d\d(?:(?:\.|:)\d+)?)$', time_expr) + mobj = re.match(r'^(\d+):(\d\d):(\d\d)$', time_expr) if mobj: - return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + float(mobj.group(3).replace(':', '.')) + return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + int(mobj.group(3)) + + mobj = re.match(r'^(\d+):(\d\d):(\d\d)(?:\.|:)(\d{1,3})$', time_expr) + if mobj: + return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + int(mobj.group(3)) + float("%03d" % int(mobj.group(4))) / 1000 def srt_subtitles_timecode(seconds):