Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `%d` and empty default in outtmpl 

Closes #388
This commit is contained in:
pukkandan 2021-06-09 14:43:51 +05:30
parent b5c5d84f60
commit 639f1cea92
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/test_YoutubeDL.py
View File

@ -735,6 +735,11 @@ class TestYoutubeDL(unittest.TestCase):
ydl = YoutubeDL(params) ydl = YoutubeDL(params)
return ydl.prepare_filename(self.outtmpl_info) return ydl.prepare_filename(self.outtmpl_info)
self.assertEqual(fname('%(height)06d.%(ext)s'), '001080.mp4')
self.assertEqual(fname('%(foo|)s-%(bar|)s.%(ext)s'), '-.mp4')
# self.assertEqual(fname('%(foo|)s.%(ext)s'), '_.mp4') # fixme
# self.assertEqual(fname('%(foo|)s'), '_') # fixme
self.assertEqual(fname('%%'), '%') self.assertEqual(fname('%%'), '%')
self.assertEqual(fname('%%%%'), '%%') self.assertEqual(fname('%%%%'), '%%')
self.assertEqual(fname('%%(width)06d.%(ext)s'), '%(width)06d.mp4') self.assertEqual(fname('%%(width)06d.%(ext)s'), '%(width)06d.mp4')
@ -746,7 +751,7 @@ class TestYoutubeDL(unittest.TestCase):
self.assertEqual(fname('Hello %(title2)s'), 'Hello %PATH%') self.assertEqual(fname('Hello %(title2)s'), 'Hello %PATH%')
self.assertEqual(fname('%(title3)s'), 'foo_bar_test') self.assertEqual(fname('%(title3)s'), 'foo_bar_test')
self.assertEqual(fname('%(formats.0)s'), "{'id' - 'id1'}") self.assertEqual(fname('%(formats.0) 15s'), " {'id' - 'id1'}")
self.assertEqual(fname('%(id)r %(height)r'), "'1234' 1080") self.assertEqual(fname('%(id)r %(height)r'), "'1234' 1080")
self.assertEqual(fname('%(formats.0)r'), "{'id' - 'id1'}") self.assertEqual(fname('%(formats.0)r'), "{'id' - 'id1'}")

1
test/test_utils.py
View File

@ -126,6 +126,7 @@ class TestUtil(unittest.TestCase):
self.assertTrue(timeconvert('bougrg') is None) self.assertTrue(timeconvert('bougrg') is None)
def test_sanitize_filename(self): def test_sanitize_filename(self):
self.assertEqual(sanitize_filename(''), '')
self.assertEqual(sanitize_filename('abc'), 'abc') self.assertEqual(sanitize_filename('abc'), 'abc')
self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e') self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e')

3
yt_dlp/YoutubeDL.py
View File

@ -936,7 +936,8 @@ class YoutubeDL(object):
# If value is an object, sanitize might convert it to a string # If value is an object, sanitize might convert it to a string
# So we convert it to repr first # So we convert it to repr first
value, fmt = repr(value), '%ss' % fmt[:-1] value, fmt = repr(value), '%ss' % fmt[:-1]
value = sanitize(key, value) if fmt[-1] in 'csr':
value = sanitize(key, value)
tmpl_dict[key] = value tmpl_dict[key] = value
return '%({key}){fmt}'.format(key=key, fmt=fmt) return '%({key}){fmt}'.format(key=key, fmt=fmt)

2
yt_dlp/utils.py
View File

@ -2107,6 +2107,8 @@ def sanitize_filename(s, restricted=False, is_id=False):
return '_' return '_'
return char return char
if s == '':
return ''
# Handle timestamps # Handle timestamps
s = re.sub(r'[0-9]+(?::[0-9]+)+', lambda m: m.group(0).replace(':', '_'), s) s = re.sub(r'[0-9]+(?::[0-9]+)+', lambda m: m.group(0).replace(':', '_'), s)
result = ''.join(map(replace_insane, s)) result = ''.join(map(replace_insane, s))