浏览代码

[YoutubeDL] Improve _format_note

Sergey M․ 9 年之前
父节点
当前提交
5d583bdf6c
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 4 0
      test/test_YoutubeDL.py
  2. 3 1
      youtube_dl/YoutubeDL.py

+ 4 - 0
test/test_YoutubeDL.py

@@ -502,6 +502,10 @@ class TestYoutubeDL(unittest.TestCase):
         assertRegexpMatches(self, ydl._format_note({
         assertRegexpMatches(self, ydl._format_note({
             'vbr': 10,
             'vbr': 10,
         }), '^\s*10k$')
         }), '^\s*10k$')
+        assertRegexpMatches(self, ydl._format_note({
+            'fps': 30,
+        }), '^30fps$')
+
 
 
     def test_postprocessors(self):
     def test_postprocessors(self):
         filename = 'post-processor-testfile.mp4'
         filename = 'post-processor-testfile.mp4'

+ 3 - 1
youtube_dl/YoutubeDL.py

@@ -1856,7 +1856,9 @@ class YoutubeDL(object):
         if fdict.get('vbr') is not None:
         if fdict.get('vbr') is not None:
             res += '%4dk' % fdict['vbr']
             res += '%4dk' % fdict['vbr']
         if fdict.get('fps') is not None:
         if fdict.get('fps') is not None:
-            res += ', %sfps' % fdict['fps']
+            if res:
+                res += ', '
+            res += '%sfps' % fdict['fps']
         if fdict.get('acodec') is not None:
         if fdict.get('acodec') is not None:
             if res:
             if res:
                 res += ', '
                 res += ', '