dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smarter upload of binary data

Browse Source
This commit is contained in:
mdipierro
2014-07-02 07:26:16 -05:00
parent bc1b4ad03a
commit eec39aeeec
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.5-trunk+timestamp.2014.07.02.03.00.34 Version 2.9.5-trunk+timestamp.2014.07.02.07.25.19
gluon/dal.py
+5 -1
View File
@@ -9223,9 +9223,13 @@ class Table(object):
for field in self: for field in self:
if field.type == 'upload' and field.name in fields: if field.type == 'upload' and field.name in fields:
value = fields[field.name] value = fields[field.name]
if value is not None and not isinstance(value, str): if not value in (None,{}) and not isinstance(value, str):
if hasattr(value, 'file') and hasattr(value, 'filename'): if hasattr(value, 'file') and hasattr(value, 'filename'):
new_name = field.store(value.file, filename=value.filename) new_name = field.store(value.file, filename=value.filename)
elif (isinstance(value,dict) and
'data' in value and 'filename' in value):
stream = StringIO.StringIO(value['data'])
new_name = field.store(stream, filename=value['filename'])
elif hasattr(value, 'read') and hasattr(value, 'name'): elif hasattr(value, 'read') and hasattr(value, 'name'):
new_name = field.store(value, filename=value.name) new_name = field.store(value, filename=value.name)
else: else: