]> jfr.im git - yt-dlp.git/commitdiff
[utils] Improve `parse_duration`
authorbashonly <redacted>
Thu, 20 Jul 2023 13:40:31 +0000 (08:40 -0500)
committerbashonly <redacted>
Thu, 20 Jul 2023 13:40:31 +0000 (08:40 -0500)
Authored by: bashonly

test/test_utils.py
yt_dlp/utils/_utils.py

index 768edfd0cfea50cee64c95f97a7b8e54fa17e76e..b36bc04c2f84d2304c98d4828e3fb5a31df85eaa 100644 (file)
@@ -655,6 +655,8 @@ def test_parse_duration(self):
         self.assertEqual(parse_duration('P0Y0M0DT0H4M20.880S'), 260.88)
         self.assertEqual(parse_duration('01:02:03:050'), 3723.05)
         self.assertEqual(parse_duration('103:050'), 103.05)
+        self.assertEqual(parse_duration('1HR 3MIN'), 3780)
+        self.assertEqual(parse_duration('2hrs 3mins'), 7380)
 
     def test_fix_xml_ampersands(self):
         self.assertEqual(
index 2e619f9ea470167177c535b0117a6c26d3502cdb..abae0f17e4969085f50766b895d9f6269ef7c8ef 100644 (file)
@@ -2021,7 +2021,7 @@ def parse_duration(s):
                 )?
                 T)?
                 (?:
-                    (?P<hours>[0-9]+)\s*h(?:ours?)?,?\s*
+                    (?P<hours>[0-9]+)\s*h(?:(?:ou)?rs?)?,?\s*
                 )?
                 (?:
                     (?P<mins>[0-9]+)\s*m(?:in(?:ute)?s?)?,?\s*