diff options
| author | Gonzalo Odiard <godiard@gmail.com> | 2010-11-24 01:40:45 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2011-01-16 21:20:51 (GMT) |
| commit | 569c713e8300da659234b2192c78a1343f032144 (patch) | |
| tree | 9cd23493f3a9f1c9fa79117f4317a2b5a750a0b8 | |
| parent | c4faafd51c63bf19e14f23b710d310269dff4b07 (diff) | |
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 <title>_<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>
| -rw-r--r-- | src/jarabe/journal/model.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |