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

add conditionnal mimetype upload file s3

Browse Source
This commit is contained in:
cyrilmanuel
2023-01-25 11:30:13 +01:00
parent 6dd6d71807
commit fa8a96f0d3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_s3/models/ir_attachment.py
+5 -2
View File
@@ -179,7 +179,7 @@ class IrAttachment(models.Model):
return super(IrAttachment, self)._store_file_read(fname, bin_size) return super(IrAttachment, self)._store_file_read(fname, bin_size)
@api.model @api.model
def _store_file_write(self, key, bin_data): def _store_file_write(self, key, bin_data, mimetype=False):
location = self.env.context.get('storage_location') or self._storage() location = self.env.context.get('storage_location') or self._storage()
if location == 's3': if location == 's3':
bucket = self._get_s3_bucket() bucket = self._get_s3_bucket()
@@ -189,7 +189,10 @@ class IrAttachment(models.Model):
file.seek(0) file.seek(0)
filename = 's3://%s/%s' % (bucket.name, key) filename = 's3://%s/%s' % (bucket.name, key)
try: try:
obj.upload_fileobj(file) if mimetype:
obj.upload_fileobj(file, ExtraArgs={'Metadata': {'ContentType': mimetype}})
else:
obj.upload_fileobj(file)
except ClientError as error: except ClientError as error:
# log verbose error from s3, return short message for user # log verbose error from s3, return short message for user
_logger.exception( _logger.exception(