matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve storage file handling

Browse Source
This commit is contained in:
Roberto Rosario
2011-03-03 12:14:20 -04:00
parent 60fb0628e0
commit 02eba1ab4a
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/documents/views.py
View File

@@ -503,9 +503,7 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE, quality=QUALITY_
if filepath:
return serve_file(request, File(file=open(filepath, 'r')))
#Save to a temporary location
document.file.open()
desc = document.file.storage.open(document.file.path)
filepath = from_descriptor_to_tempfile(desc, document.checksum)
filepath = from_descriptor_to_tempfile(document.open(), document.checksum)
output_file = convert(filepath, size=size, format='jpg', quality=quality, extra_options=tranformation_string, page=page-1)
return serve_file(request, File(file=open(output_file, 'r')), content_type='image/jpeg')
except Exception, e:
@@ -525,7 +523,7 @@ def document_download(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
#Test permissions and trigger exception
document.file.open()
document.open()
return serve_file(request, document.file, save_as='%s' % document.get_fullname())
except Exception, e:
messages.error(request, e)