瀏覽代碼

[utils] Improve unified_timestamp

Sergey M․ 8 年之前
父節點
當前提交
2ae2ffda5e
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 0
      test/test_utils.py
  2. 1 1
      youtube_dl/utils.py

+ 1 - 0
test/test_utils.py

@@ -340,6 +340,7 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_timestamp('May 16, 2016 11:15 PM'), 1463440500)
         self.assertEqual(unified_timestamp('May 16, 2016 11:15 PM'), 1463440500)
         self.assertEqual(unified_timestamp('Feb 7, 2016 at 6:35 pm'), 1454870100)
         self.assertEqual(unified_timestamp('Feb 7, 2016 at 6:35 pm'), 1454870100)
         self.assertEqual(unified_timestamp('2017-03-30T17:52:41Q'), 1490896361)
         self.assertEqual(unified_timestamp('2017-03-30T17:52:41Q'), 1490896361)
+        self.assertEqual(unified_timestamp('Sep 11, 2013 | 5:49 AM'), 1378878540)
 
 
     def test_determine_ext(self):
     def test_determine_ext(self):
         self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4')
         self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4')

+ 1 - 1
youtube_dl/utils.py

@@ -1179,7 +1179,7 @@ def unified_timestamp(date_str, day_first=True):
     if date_str is None:
     if date_str is None:
         return None
         return None
 
 
-    date_str = date_str.replace(',', ' ')
+    date_str = re.sub(r'[,|]', '', date_str)
 
 
     pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0
     pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0
     timezone, date_str = extract_timezone(date_str)
     timezone, date_str = extract_timezone(date_str)