mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 00:16:48 +00:00
Minor filename encoding improvement in a common case
This commit is contained in:
parent
fa59f4b6a9
commit
46cbda0be4
@ -61,6 +61,13 @@ class TestUtil(unittest.TestCase):
|
||||
for fbc in forbidden:
|
||||
self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
|
||||
|
||||
# Handle a common case more neatly
|
||||
self.assertEqual(sanitize_filename(u'大声带 - Song', restricted=True), u'Song')
|
||||
self.assertEqual(sanitize_filename(u'总统: Speech', restricted=True), u'Speech')
|
||||
# .. but make sure the file name is never empty
|
||||
self.assertTrue(sanitize_filename(u'-', restricted=True) != u'')
|
||||
self.assertTrue(sanitize_filename(u':', restricted=True) != u'')
|
||||
|
||||
def test_ordered_set(self):
|
||||
self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7])
|
||||
self.assertEqual(orderedSet([]), [])
|
||||
|
@ -218,6 +218,9 @@ def sanitize_filename(s, restricted=False):
|
||||
while '__' in result:
|
||||
result = result.replace('__', '_')
|
||||
result = result.strip('_')
|
||||
# Common case of "Foreign band name - English song title"
|
||||
if restricted and result.startswith('-_'):
|
||||
result = result[2:]
|
||||
if not result:
|
||||
result = '_'
|
||||
return result
|
||||
|
Loading…
Reference in New Issue
Block a user