😍 ir_attachment_url: cleanup code

Author: yelizariev

ir_attachment_url/__manifest__.py

@@ -5,7 +5,7 @@
  "summary": """Use attachment URL and upload data to external storage""",
  "category": "Tools",
  "images": [],
- "version": "14.0.2.0.1",
+ "version": "14.0.2.1.0",
  "application": False,
  "author": "IT-Projects LLC, Ildar Nasyrov",
  "website": "https://twitter.com/OdooFree",

ir_attachment_url/doc/changelog.rst

@@ -1,15 +1,19 @@
+`2.1.0`
+-------
+
+- **Improvement:** Performance improvement
+
 `2.0.1`
 -------
 
 - **Fix:** error on creating new record with Binary field
 
-
 `2.0.0`
 -------
 
-- **Improvment:** Images defined by URL are now uploaded as binary files
-- **Improvment:** Request to binary files with non-falsy `url` attribute return HTTP 301 response
-- **Improvment:** Removed requirement of setting ir_attachment_url as server wide module
+- **Improvement:** Images defined by URL are now uploaded as binary files
+- **Improvement:** Request to binary files with non-falsy `url` attribute return HTTP 301 response
+- **Improvement:** Removed requirement of setting ir_attachment_url as server wide module
 - **Discard:** Passing url to Binary/Image field is no longer supported
 - **Fix:** Returing 302 instead of 301 http redirections to escape browser caching
 

ir_attachment_url/models/ir_attachment.py

@@ -1,5 +1,5 @@
 # Copyright 2016-2018 Ildar Nasyrov <https://it-projects.info/team/iledarn>
-# Copyright 2016-2020 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
+# Copyright 2016-2018,2020 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 # Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
@@ -39,69 +39,36 @@ def _filter_protected_attachments(self):
 
  @api.model_create_multi
  def create(self, vals_list):
- record_tuple_set = set()
+ url_fields = self.env.context.get("ir_attachment_url_fields")
+ if url_fields:
+ url_fields = url_fields.split(",")
+ self._set_where_to_store(vals_list)
  for values in vals_list:
- # ---
- # em230418: handling ir_attachment_url_fields context
  if (
- self.env.context.get("ir_attachment_url_fields")
+ url_fields
  and values.get("type") != "url"
  and not values.get("url")
  and values.get("res_model")
  and values.get("res_field")
  and values.get("datas")
  ):
  full_field_name = values["res_model"] + "." + values["res_field"]
- if full_field_name in self.env.context.get(
- "ir_attachment_url_fields"
- ).split(","):
+ if full_field_name in url_fields:
  values["url"] = values["datas"]
  values["type"] = "url"
  del values["datas"]
- # ---
-
- self._set_where_to_store(vals_list)
-
- # everything else is based on
- # https://github.com/odoo/odoo/blob/fa852ba1c5707b71469c410063f338eef261ab2b/odoo/addons/base/models/ir_attachment.py#L506-L524
-
- # remove computed field depending of datas
- for field in ("file_size", "checksum"):
- values.pop(field, False)
  bucket = values.pop("_bucket", None)
- values = self._check_contents(values)
- if "datas" in values:
- # ===============
- # if bucket is not available, attachment is saved as usual
+ if (
+ bucket
+ and values.get("datas")
+ and values.get("res_model") not in ["ir.ui.view", "ir.ui.menu"]
+ ):
+ values = self._check_contents(values)
  data = values.pop("datas")
  mimetype = values.pop("mimetype")
- if (
- bucket
- and values.get("res_model") not in ["ir.ui.view", "ir.ui.menu"]
- and self._storage() != "db"
- and data
- ):
- values.update(
- self._get_datas_related_values_with_bucket(
- bucket, data, mimetype
- )
- )
- else:
- values.update(
- self._get_datas_related_values(
- base64.b64decode(data or b""), mimetype
- )
- )
- # end
- # ===============
- # 'check()' only uses res_model and res_id from values, and make an exists.
- # We can group the values by model, res_id to make only one query when
- # creating multiple attachments on a single record.
- record_tuple = (values.get("res_model"), values.get("res_id"))
- record_tuple_set.add(record_tuple)
- for record_tuple in record_tuple_set:
- (res_model, res_id) = record_tuple
- self.check("create", values={"res_model": res_model, "res_id": res_id})
+ values.update(
+ self._get_datas_related_values_with_bucket(bucket, data, mimetype)
+ )
  return super(IrAttachment, self).create(vals_list)
 
  def _get_datas_related_values_with_bucket(