archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent double map types in the filename.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-05-20 16:20:33 +02:00
parent 30f71ac9fc
commit 5f5f0d8db9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blender_cloud/pillar.py
View File

@ -544,8 +544,12 @@ async def download_file_by_uuid(file_uuid,
save_as_json(file_desc, metadata_file) save_as_json(file_desc, metadata_file)
root, ext = os.path.splitext(file_desc['filename']) root, ext = os.path.splitext(file_desc['filename'])
file_path = os.path.join(target_directory, if root.endswith(map_type):
sanitize_filename('%s-%s%s' % (root, map_type, ext))) target_filename = '%s%s' % (root, ext)
else:
target_filename = '%s-%s%s' % (root, map_type, ext)
file_path = os.path.join(target_directory, sanitize_filename(target_filename))
file_url = file_desc['link'] file_url = file_desc['link']
# log.debug('Texture %r:\n%s', file_uuid, pprint.pformat(file_desc.to_dict())) # log.debug('Texture %r:\n%s', file_uuid, pprint.pformat(file_desc.to_dict()))
loop.call_soon_threadsafe(file_loading, file_path, file_desc) loop.call_soon_threadsafe(file_loading, file_path, file_desc)