archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Added _format_name to handle existing extensions

Browse Source
This commit is contained in:
Francesco Siddi
2016-01-08 15:12:19 +01:00
parent ff174439c3
commit 4ce2d60df8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pillar/application/__init__.py
View File

@@ -248,6 +248,14 @@ def update_file_name(item):
downloading an asset we get a human-readable name. downloading an asset we get a human-readable name.
""" """
def _format_name(name, format, size=None):
# If the name already has an extention, and such extension matches the
# format, only inject the size.
root, ext = os.path.splitext(name)
size = "-{0}".format(size) if size else ''
ext = ext if len(ext) > 1 and ext[1:] == format else ".{0}".format(format)
return "{0}{1}{2}".format(root, size, ext)
def _update_name(item, file_id): def _update_name(item, file_id):
files_collection = app.data.driver.db['files'] files_collection = app.data.driver.db['files']
f = files_collection.find_one({'_id': file_id}) f = files_collection.find_one({'_id': file_id})
@@ -257,14 +265,14 @@ def update_file_name(item):
try: try:
storage = GoogleCloudStorageBucket(str(item['project'])) storage = GoogleCloudStorageBucket(str(item['project']))
blob = storage.Get(f['file_path'], to_dict=False) blob = storage.Get(f['file_path'], to_dict=False)
storage.update_name(blob, "{0}.{1}".format( name = _format_name(item['name'], f['format'])
item['name'], f['format'])) storage.update_name(blob, name)
try: try:
# Assign the same name to variations # Assign the same name to variations
for v in f['variations']: for v in f['variations']:
blob = storage.Get(v['file_path'], to_dict=False) blob = storage.Get(v['file_path'], to_dict=False)
storage.update_name(blob, "{0}-{1}.{2}".format( name = _format_name(item['name'], v['format'], v['size'])
item['name'], v['size'], v['format'])) storage.update_name(blob, name)
except KeyError: except KeyError:
pass pass
except AttributeError: except AttributeError: