diff options
| author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-07-27 09:43:48 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-07-27 09:43:48 (GMT) |
| commit | 81eaa9b6f39e7810c5b57898986e50902644fa43 (patch) | |
| tree | fa6e36a332c1bf6f19d70cb316691fa66783c92c /src | |
| parent | 968c07060d106feb04e57f78f38698a4f3dbf65a (diff) | |
Fix naming of entries with unknown extensions (silbe) #1040
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/journal/model.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index 8f0fa22..7517d78 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -483,9 +483,11 @@ def write(metadata, file_path='', update_mtime=True): def _get_file_name(title, mime_type): file_name = title - extension = '.' + mime.get_primary_extension(mime_type) - if not file_name.endswith(extension): - file_name += extension + extension = mime.get_primary_extension(mime_type) + if extension is not None and extension: + extension = '.' + extension + if not file_name.endswith(extension): + file_name += extension # Invalid characters in VFAT filenames. From # http://en.wikipedia.org/wiki/File_Allocation_Table @@ -498,7 +500,7 @@ def _get_file_name(title, mime_type): max_len = 250 if len(file_name) > max_len: name, extension = os.path.splitext(file_name) - file_name = name[0:max_len - extension] + extension + file_name = name[0:max_len - len(extension)] + extension return file_name |