From 569c713e8300da659234b2192c78a1343f032144 Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Wed, 24 Nov 2010 01:40:45 +0000 Subject: Fix naming of "duplicate" files on external media (SL#2060) When there are already files matching the title of the Journal entry, name the new ones _<counter>.<extension> (e.g. foobar_3.jpg) instead of appending _<counter> to it on each iteration (e.g. foobar_1_2_3.jpg). Reviewed-by: James Cameron <quozl@laptop.org> Ack-by: Sascha Silbe <sascha-pgp@silbe.org> --- diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index 3d9b695..9ab8c5e 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -599,8 +599,8 @@ def _get_file_name(title, mime_type): def _get_unique_file_name(mount_point, file_name): if os.path.exists(os.path.join(mount_point, file_name)): i = 1 + name, extension = os.path.splitext(file_name) while len(file_name) <= 255: - name, extension = os.path.splitext(file_name) file_name = name + '_' + str(i) + extension if not os.path.exists(os.path.join(mount_point, file_name)): break -- cgit v0.9.1