[16.0][MIG-REF] fs_import_image_advanced

- Refactor from storage_import_image_advanced
- Change to user fs_storage and fs_product_multi_image as dependencies
- Fix test to use properly test class dependency

Author: ChrisOForgeFlow

storage_import_image_advanced/README.rst fs_import_image_advanced/README.rststorage_import_image_advanced/README.rst renamed to fs_import_image_advanced/README.rst

@@ -7,30 +7,35 @@ Import Storage product image
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:1d706ff34e4744344df7869c85d93483d4df078dd65b142064cbf75bc4f0e4eb
+   !! source digest: sha256:6b8c3532008323c4855704ee06cb4519b25bf2ff635698948a373b218cc331cf
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Beta
+    :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstorage-lightgray.png?logo=github
-    :target: https://github.com/OCA/storage/tree/15.0/storage_import_image_advanced
+    :target: https://github.com/OCA/storage/tree/16.0/fs_import_image_advanced
     :alt: OCA/storage
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/storage-15-0/storage-15-0-storage_import_image_advanced
+    :target: https://translation.odoo-community.org/projects/storage-16-0/storage-16-0-fs_import_image_advanced
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/storage&target_branch=15.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/storage&target_branch=16.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
 Import product image from a CVS file from URLs or ZIP file',
 Idea based on an idea of the 'image_product_import' from Cybrosys Techno Solutions
 
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
 **Table of contents**
 
 .. contents::
@@ -42,7 +47,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/storage/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/storage/issues/new?body=module:%20storage_import_image_advanced%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/storage/issues/new?body=module:%20fs_import_image_advanced%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -76,6 +81,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/storage <https://github.com/OCA/storage/tree/15.0/storage_import_image_advanced>`_ project on GitHub.
+This module is part of the `OCA/storage <https://github.com/OCA/storage/tree/16.0/fs_import_image_advanced>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

storage_import_image_advanced/__init__.py fs_import_image_advanced/__init__.pystorage_import_image_advanced/__init__.py renamed to fs_import_image_advanced/__init__.py

@@ -6,14 +6,15 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Import Storage product image",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "summary": "Import product images using CSV",
     "author": "Akretion, Camptocamp, Odoo Community Association (OCA)",
     "company": "Akretion",
     "maintainer": "Akretion",
     "website": "https://github.com/OCA/storage",
     "category": "Product",
-    "depends": ["storage_image_product", "queue_job"],
+    "development_status": "Alpha",
+    "depends": ["fs_product_multi_image", "sale", "queue_job"],
     "external_dependencies": {
         "python": ["python-magic", "validators"],
         "deb": ["libmagic1"],

…ge_import_image_advanced/__manifest__.py fs_import_image_advanced/__manifest__.pystorage_import_image_advanced/__manifest__.py renamed to fs_import_image_advanced/__manifest__.py storage_import_image_advanced/__manifest__.py renamed to fs_import_image_advanced/__manifest__.py

@@ -235,12 +235,12 @@ msgid "Source type"
 msgstr ""
 
 #. module: shopinvader_import_image
-#: model:ir.model.fields,field_description:shopinvader_import_image.field_shopinvader_import_product_image__storage_backend_id
+#: model:ir.model.fields,field_description:shopinvader_import_image.field_shopinvader_import_product_image__fs_storage_id
 msgid "Storage Backend"
 msgstr ""
 
 #. module: shopinvader_import_image
-#: model:ir.model.fields,field_description:shopinvader_import_image.field_shopinvader_import_product_image__source_storage_backend_id
+#: model:ir.model.fields,field_description:shopinvader_import_image.field_shopinvader_import_product_image__source_fs_storage_id
 msgid "Storage Backend with images"
 msgstr ""
 

…e_import_image_advanced/data/ir_cron.xml fs_import_image_advanced/data/ir_cron.xmlstorage_import_image_advanced/data/ir_cron.xml renamed to fs_import_image_advanced/data/ir_cron.xml storage_import_image_advanced/data/ir_cron.xml renamed to fs_import_image_advanced/data/ir_cron.xml

@@ -272,12 +272,12 @@ msgid "Source Type"
 msgstr ""
 
 #. module: storage_import_image_advanced
-#: model:ir.model.fields,field_description:storage_import_image_advanced.field_storage_import_product_image__storage_backend_id
+#: model:ir.model.fields,field_description:storage_import_image_advanced.field_storage_import_product_image__fs_storage_id
 msgid "Storage Backend"
 msgstr ""
 
 #. module: storage_import_image_advanced
-#: model:ir.model.fields,field_description:storage_import_image_advanced.field_storage_import_product_image__source_storage_backend_id
+#: model:ir.model.fields,field_description:storage_import_image_advanced.field_storage_import_product_image__source_fs_storage_id
 msgid "Storage Backend with images"
 msgstr ""
 

…advanced/data/queue_job_channel_data.xml …advanced/data/queue_job_channel_data.xmlstorage_import_image_advanced/data/queue_job_channel_data.xml renamed to fs_import_image_advanced/data/queue_job_channel_data.xml storage_import_image_advanced/data/queue_job_channel_data.xml renamed to fs_import_image_advanced/data/queue_job_channel_data.xml

@@ -57,9 +57,7 @@ def _default_csv_header(self):
         flds = [product_identifier, "tag", "path"]
         return ",".join(flds)
 
-    storage_backend_id = fields.Many2one(
-        "storage.backend", "Storage Backend", required=True
-    )
+    fs_storage_id = fields.Many2one("fs.storage", "FS Storage", required=True)
     product_model = fields.Selection(
         [
             ("product.template", "Product template"),
@@ -104,9 +102,7 @@ def _default_csv_header(self):
     )
     csv_delimiter = fields.Char(string="CSV file delimiter", default=",", required=True)
     source_zipfile = fields.Binary("ZIP with images", required=False)
-    source_storage_backend_id = fields.Many2one(
-        "storage.backend", "Storage Backend with images"
-    )
+    source_fs_storage_id = fields.Many2one("fs.storage", "FS Storage with images")
     external_csv_path = fields.Char(
         string="Path to CSV file",
         help="Relative path of the CSV file located in the external storage",
@@ -133,7 +129,7 @@ def _default_csv_header(self):
     @api.depends("report")
     def _compute_report_html(self):
         # TODO: add tests
-        tmpl = self.env.ref("storage_import_image_advanced.report_html")
+        tmpl = self.env.ref("fs_import_image_advanced.report_html")
         for record in self:
             if not record.report:
                 record.report_html = ""
@@ -154,7 +150,7 @@ def _get_base64(self, file_path):
 
     def _read_from_url(self, file_path):
         if validators.url(file_path):
-            return urlopen(file_path).read()
+            return urlopen(file_path, timeout=120).read()
         return None
 
     def _read_from_zip_file(self, file_path):
@@ -170,15 +166,15 @@ def _read_from_zip_file(self, file_path):
                     return None
 
     def _read_from_external_storage(self, file_path):
-        if not self.source_storage_backend_id:
+        if not self.source_fs_storage_id:
             raise exceptions.UserError(_("No storage backend provided!"))
-        return self.source_storage_backend_id._get_bin_data(file_path)
+        return self.source_fs_storage_id._get_filesystem().open(file_path)
 
     def _read_csv(self):
         if self.file_csv:
             return base64.b64decode(self.file_csv)
         elif self.external_csv_path:
-            return self.source_storage_backend_id._get_bin_data(self.external_csv_path)
+            return self.source_fs_storage_id._get_bin_data(self.external_csv_path)
 
     def _get_lines(self):
         lines = []
@@ -258,8 +254,8 @@ def _assign_product_tmpl_attr_values(self, product):
 
     def _do_import(self, lines, product_model, options=None):
         tag_obj = self.env["image.tag"]
-        image_obj = self.env["storage.image"]
-        relation_obj = self.env["product.image.relation"]
+        image_obj = self.env["fs.image"]
+        relation_obj = self.env["fs.product.image"]
         product_identifier_field = self._get_product_identifier_field()
         report = {
             "created": set(),
@@ -305,8 +301,6 @@ def _do_import(self, lines, product_model, options=None):
             if not file_vals:
                 report["file_not_found"].add(prod[product_identifier_field])
                 continue
-            file_vals.update({"name": file_vals["name"], "alt_name": file_vals["name"]})
-            # storage_file = file_obj.create(file_vals)
             tag_id = tag_by_name.get(line["tag_name"])
 
             if product_model == "product.template":
@@ -344,7 +338,6 @@ def _do_import(self, lines, product_model, options=None):
                     )
                 ]
             relation_obj.create(img_relation_values)
-            image._compute_main_thumbs()
             report["created"].add(prod[product_identifier_field])
         report["created"] = sorted(report["created"])
         report["file_not_found"] = sorted(report["file_not_found"])
@@ -356,11 +349,10 @@ def _prepare_file_values(self, file_path, filetype="image"):
         if not file_data:
             return {}
         vals = {
-            "data": file_data["b64"],
-            "name": name,
-            "file_type": filetype,
-            "mimetype": file_data["mimetype"],
-            "backend_id": self.storage_backend_id.id,
+            "image": {
+                "filename": name,
+                "content": file_data["b64"],
+            },
         }
         return vals