From 42cb53fcfa2e8bbc7a96bc1a0ad1e90c1917dccd Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sun, 28 Oct 2012 22:47:02 +0100 Subject: modified filename escaping to a "smarter" one --- youtube_dl/utils.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'youtube_dl') diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 839da17d0..a64937b4c 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -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 """ -- cgit v1.2.3