archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix: Made bpy.path.ensure_ext compatible with compound extensions.

Browse Source 
Extensions such as ".tar.gz" are now also supported. Before this patch,
ensure_ext('demo.tar.gz', '.tar.gz') would return 'demo.tar.tar.gz'.

This results in issues with the `ExportHelper` mix-in class; clicking
an existing file in the file dialogue warns about overwriting it
(highlighting the input box in red), but then saves to a different
file.

Also added a unit test for the new behaviour.

Reviewers: mont29, campbellbarton

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D1498
This commit is contained in:
Sybren A. Stüvel
2015-09-03 13:09:16 +02:00
parent e5e65b1099
commit 8383a2d4cc
2 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
release/scripts/modules/bpy/path.py
View File

@@ -283,22 +283,18 @@ def ensure_ext(filepath, ext, case_sensitive=False):
"""
Return the path with the extension added if it is not already set.
:arg ext: The extension to check for.
:arg ext: The extension to check for, can be a compound extension. Should
start with a dot, such as '.blend' or '.tar.gz'.
:type ext: string
:arg case_sensitive: Check for matching case when comparing extensions.
:type case_sensitive: bool
"""
fn_base, fn_ext = _os.path.splitext(filepath)
if fn_base and fn_ext:
if ((case_sensitive and ext == fn_ext) or
(ext.lower() == fn_ext.lower())):
return filepath
else:
return fn_base + ext
if ((case_sensitive and filepath.endswith(ext)) or
(not case_sensitive and filepath.lower().endswith(ext.lower()))):
return filepath
else:
return filepath + ext
return filepath + ext
def module_names(path, recursive=False):