diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2015-12-19 19:29:51 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2015-12-19 19:29:51 +0800 |
| commit | db2fe38b5508cbd28b89893219d9cccd41406851 (patch) | |
| tree | 3c7d03cafd8f578c3c7c380321c88f2f5142b0d1 | |
| parent | d631d5f9f27f93767226192e4288990413fa9dbd (diff) | |
[utils] Support alternative timestamp format in TTML
Fixes #7608
| -rw-r--r-- | test/test_utils.py | 1 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 86045e680..e4e8d3825 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -667,6 +667,7 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4') self.assertEqual(parse_dfxp_time_expr('0.1s'), 0.1) 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) def test_dfxp2srt(self): dfxp_data = '''<?xml version="1.0" encoding="UTF-8"?> diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index ee20c3d9b..5b396ede8 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1982,9 +1982,9 @@ 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(?:(?:\.|:)\d+)?)$', time_expr) if mobj: - return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + float(mobj.group(3)) + return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + float(mobj.group(3).replace(':', '.')) def srt_subtitles_timecode(seconds): |