entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

upload_storage: clarify get_filename function, renaming it get_fs_filename (#42236)

This commit is contained in:
Thomas NOËL 2020-05-03 16:42:22 +02:00
parent 3827c81c1d
commit d66eab7cd9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wcs/formdef.py
View File

@ -1600,20 +1600,20 @@ def clean_unused_files(publisher):
for formdef in FormDef.select(ignore_migration=True) + CardDef.select(ignore_migration=True):
for option_data in (formdef.workflow_options or {}).values():
if is_upload(option_data):
yield option_data.get_filename()
yield option_data.get_fs_filename()
for formdata in formdef.data_class().select(ignore_errors=True):
for field_data in itertools.chain(
(formdata.data or {}).values(),
(formdata.workflow_data or {}).values()):
if is_upload(field_data):
yield field_data.get_filename()
yield field_data.get_fs_filename()
for part in formdata.iter_evolution_parts():
if is_attachment(part):
yield part.filename
for user in publisher.user_class.select():
for field_data in (user.form_data or {}).values():
if is_upload(field_data):
yield field_data.get_filename()
yield field_data.get_fs_filename()
used_filenames = set()
for filename in accumulate_filenames():

2
wcs/forms/common.py
View File

@ -81,7 +81,7 @@ class FileDirectory(Directory):
if self.thumbnails:
if file.can_thumbnail():
try:
thumbnail = misc.get_thumbnail(file.get_filename(),
thumbnail = misc.get_thumbnail(file.get_fs_filename(),
content_type=file.content_type)
response.set_content_type('image/png')
return thumbnail

2
wcs/qommon/upload_storage.py
View File

@ -58,7 +58,7 @@ class PicklableUpload(Upload):
# quack like UploadedFile
return self.get_file_pointer()
def get_filename(self):
def get_fs_filename(self):
if not hasattr(self, 'qfilename'):
raise AttributeError('filename')
if hasattr(self, 'storage_attrs'): # alternative storage