From 7adcbe759419320bf6224247640e2cc9f058fa8a Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 25 Aug 2014 12:59:53 +0200
Subject: [rtlnl] Extract duration

---
 youtube_dl/utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'youtube_dl/utils.py')

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 2b05fd7b7..53977cd2a 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1338,7 +1338,7 @@ def parse_duration(s):
         return None
 
     m = re.match(
-        r'(?:(?:(?P<hours>[0-9]+)[:h])?(?P<mins>[0-9]+)[:m])?(?P<secs>[0-9]+)s?(?::[0-9]+)?$', s)
+        r'(?:(?:(?P<hours>[0-9]+)[:h])?(?P<mins>[0-9]+)[:m])?(?P<secs>[0-9]+)s?(?::[0-9]+)?(?P<ms>\.[0-9]+)?$', s)
     if not m:
         return None
     res = int(m.group('secs'))
@@ -1346,6 +1346,8 @@ def parse_duration(s):
         res += int(m.group('mins')) * 60
         if m.group('hours'):
             res += int(m.group('hours')) * 60 * 60
+    if m.group('ms'):
+        res += float(m.group('ms'))
     return res
 
 
-- 
cgit v1.2.3