From 7c3a7621071b58335389e3f360a58753cab483a2 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Tue, 28 May 2013 12:17:08 +0200 Subject: [PATCH] Add "1" if sanitized filename already exists (fixes #50) --- kcc/comic2ebook.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index 36be9c0..b92ed22 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -579,14 +579,16 @@ def slugify(value): def sanitizeTree(filetree): - for root, dirs, files in os.walk(filetree): + for root, dirs, files in os.walk(filetree, False): for name in files: if name.startswith('.') or name.lower() == 'thumbs.db': os.remove(os.path.join(root, name)) else: splitname = os.path.splitext(name) - os.rename(os.path.join(root, name), - os.path.join(root, slugify(splitname[0]) + splitname[1])) + slugified = slugify(splitname[0]) + while os.path.exists(os.path.join(root, slugified + splitname[1])): + slugified += "1" + os.rename(os.path.join(root, name), os.path.join(root, slugified + splitname[1])) for name in dirs: if name.startswith('.'): os.remove(os.path.join(root, name))