depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-22 00:37:41 +00:00
Code Issues Releases Wiki Activity

modified filename escaping to a "smarter" one

Browse source
This commit is contained in:
Filippo Valsorda 2012-10-28 22:47:02 +01:00
parent fe4d68e196
commit 42cb53fcfa
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/test_utils.py
View file

@ -22,13 +22,13 @@ class TestUtil(unittest.TestCase):
self.assertEqual(sanitize_filename(u'123'), u'123')
self.assertEqual(u'abc_de', sanitize_filename(u'abc/de'))
self.assertTrue(u'de' in sanitize_filename(u'abc/de'))
self.assertEqual(u'abc-de', sanitize_filename(u'abc/de'))
self.assertFalse(u'/' in sanitize_filename(u'abc/de///'))
self.assertEqual(u'abc_de', sanitize_filename(u'abc\\de'))
self.assertEqual(u'abc_de', sanitize_filename(u'abc\\de'))
self.assertTrue(u'de' in sanitize_filename(u'abc\\de'))
self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de'))
self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|'))
self.assertEqual(u'yes no', sanitize_filename(u'yes? no'))
self.assertEqual(u'this - that', sanitize_filename(u'this: that'))
self.assertEqual(sanitize_filename(u'ä'), u'ä')
self.assertEqual(sanitize_filename(u'кириллица'), u'кириллица')

16
youtube_dl/utils.py
View file

@ -194,10 +194,20 @@ def timeconvert(timestr):
def sanitize_filename(s):
"""Sanitizes a string so it could be used as part of a filename."""
def replace_insane(char):
if char in u' .\\/|?*<>:"' or ord(char) < 32:
return '_'
if char == '?' or ord(char) < 32 or ord(char) == 127:
return ''
elif char == '"':
return '\''
elif char == ':':
return ' -'
elif char in '\\/|*<>':
return '-'
return char
return u''.join(map(replace_insane, s)).strip('_')
result = u''.join(map(replace_insane, s))
while '--' in result:
result = result.replace('--', '-')
return result.strip('-')
def orderedSet(iterable):
""" Remove all duplicates from the input iterable """