Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-24 16:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/174/head' of github.com:camptocamp/odoo-cloud-platform into merge-branch-2543-bssmb-362-fix_set_acl_with_prod_dump_in_dev-dd4cd51b

Browse Source
This commit is contained in:
Akim Juillerat
2020-05-28 15:59:21 +02:00
parent a6f4e7990f 123947100b
commit f9e98fba7f
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_s3/models/ir_attachment.py
+20 -18
View File
@@ -122,10 +122,12 @@ class IrAttachment(models.Model):
bucket.meta.client.head_object(
Bucket=bucket.name, Key=key
)
res = io.BytesIO()
bucket.download_fileobj(key, res)
res.seek(0)
read = base64.b64encode(res.read())
if bin_size:
return bucket.Object(key).content_length
with io.BytesIO() as res:
bucket.download_fileobj(key, res)
res.seek(0)
read = base64.b64encode(res.read())
except ClientError:
read = ''
_logger.info(
@@ -141,20 +143,20 @@ class IrAttachment(models.Model):
if location == 's3':
bucket = self._get_s3_bucket()
obj = bucket.Object(key=key)
file = io.BytesIO()
file.write(bin_data)
file.seek(0)
filename = 's3://%s/%s' % (bucket.name, key)
try:
obj.upload_fileobj(file)
except ClientError as error:
# log verbose error from s3, return short message for user
_logger.exception(
'Error during storage of the file %s' % filename
)
raise exceptions.UserError(
_('The file could not be stored: %s') % str(error)
)
with io.BytesIO() as file:
file.write(bin_data)
file.seek(0)
filename = 's3://%s/%s' % (bucket.name, key)
try:
obj.upload_fileobj(file)
except ClientError as error:
# log verbose error from s3, return short message for user
_logger.exception(
'Error during storage of the file %s' % filename
)
raise exceptions.UserError(
_('The file could not be stored: %s') % str(error)
)
else:
_super = super(IrAttachment, self)
filename = _super._store_file_write(key, bin_data)