[ADD] web_assets_manager: migrate from unmerged 15.0 to 18.0

- Bump version to 18.0.1.0.0
- ir_qweb.py: replace removed get_asset_bundle with _get_asset_content
  override; drop async_load from _get_asset_nodes; import
  ALLOWED_DEBUG_MODES from odoo.addons.web.models.ir_http; derive
  mimetype via mimetypes.guess_type instead of atype field
- views: rename <tree> to <list>, view_mode tree,form -> list,form
- web_assets.py: view_mode tree -> list in action_open_files

Author: jans23

web_assets_manager/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Web Assets Manager",
-    "version": "15.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Hidden",
     "author": "initOS GmbH, Nitrokey GmbH, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web",

web_assets_manager/models/ir_qweb.py

@@ -1,16 +1,18 @@
 # © 2024 initOS GmbH
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 import logging
+import mimetypes
 import os
 import re
 
 from odoo import models
-from odoo.http import ALLOWED_DEBUG_MODES
+from odoo.addons.web.models.ir_http import ALLOWED_DEBUG_MODES
 
 _logger = logging.getLogger(__name__)
 
 # Failsafe because it has the potential to lock everyone out of the UI
-ALLOWED_DEBUG_MODES.append("unfiltered")
+if "unfiltered" not in ALLOWED_DEBUG_MODES:
+    ALLOWED_DEBUG_MODES.append("unfiltered")
 
 
 def filesize(filename):
@@ -31,45 +33,74 @@ def filesize(filename):
 class IrQweb(models.AbstractModel):
     _inherit = "ir.qweb"
 
-    def _generate_asset_nodes(
+    def _get_asset_nodes(
         self,
         bundle,
         css=True,
         js=True,
         debug=False,
-        async_load=False,
         defer_load=False,
         lazy_load=False,
         media=None,
     ):
+        path = None
+        assets = self.env["web.assets"].sudo()
+        try:
+            from odoo.http import request
 
-        if "|" in bundle:
-            bundle = bundle.rsplit("|", 1)[0]
+            path = request.httprequest.path
+        except RuntimeError:  # pylint: disable=except-pass
+            pass
+
+        if path:
+            domain = [
+                ("bundle", "=", bundle),
+                ("active", "=", True),
+                ("path_regex", "!=", False),
+            ]
+            for rec in assets.search(domain):
+                pattern = r"^" + rec.path_regex.strip(r"^")
+                if re.match(pattern, path):
+                    assets = rec
+                    break
 
-        return super()._generate_asset_nodes(
+        skip_filtering = bool(debug and "unfiltered" in debug)
+        if assets and not skip_filtering:
+            bundle += f"|{assets.hashsum}"
+
+        return super(
+            IrQweb,
+            self.with_context(
+                bundle_skip_filtering=skip_filtering,
+            ),
+        )._get_asset_nodes(
             bundle,
             css=css,
             js=js,
             debug=debug,
-            async_load=async_load,
             defer_load=defer_load,
             lazy_load=lazy_load,
             media=media,
         )
 
-    def get_asset_bundle(self, bundle_name, files, env=None, css=True, js=True):
-        if "|" in bundle_name:
-            bundle_name = bundle_name.rsplit("|", 1)[0]
+    def _get_asset_content(self, bundle, assets_params=None):
+        # Extract and strip the hashsum suffix appended by _get_asset_nodes
+        hashsum = None
+        if "|" in bundle:
+            bundle, hashsum = bundle.rsplit("|", 1)
+
+        files, external_assets = super()._get_asset_content(
+            bundle, assets_params=assets_params
+        )
 
-        hashsum = self.env.context.get("bundle_hashsum")
         skip = self.env.context.get("bundle_skip_filtering")
         if not hashsum or skip:
-            return super().get_asset_bundle(bundle_name, files, env=env, css=css, js=js)
+            return files, external_assets
 
-        urls = {a["url"]: a for a in files}
+        urls = {f["url"]: f for f in files}
 
-        # Synchronize assets files
-        assets = self.env["web.assets"].sudo().search([("bundle", "=", bundle_name)])
+        # Synchronize web.assets.file records with the actual bundle file list
+        assets = self.env["web.assets"].sudo().search([("bundle", "=", bundle)])
         assets.mapped("file_ids").filtered_domain(
             [("name", "not in", list(urls))]
         ).unlink()
@@ -81,83 +112,25 @@ def get_asset_bundle(self, bundle_name, files, env=None, css=True, js=True):
             )
 
         for asset in assets:
-            for file in set(urls) - set(asset.mapped("file_ids.name")):
-                data = urls[file]
-
+            for file_url in set(urls) - set(asset.mapped("file_ids.name")):
+                data = urls[file_url]
+                mimetype = mimetypes.guess_type(file_url)[0] or ""
                 asset.file_ids.create(
                     {
                         "asset_id": asset.id,
-                        "name": file,
-                        "mimetype": data["atype"],
+                        "name": file_url,
+                        "mimetype": mimetype,
                         "include": True,
                         "size": filesize(data.get("filename", "")),
                     }
                 )
 
-        # Filter the assets files
+        # Filter the file list to only the files enabled in the matching config
         domain = [
-            ("bundle", "=", bundle_name),
+            ("bundle", "=", bundle),
             ("hashsum", "=", hashsum),
             ("active", "=", True),
         ]
         assets = assets.search(domain, limit=1)
         names = set(assets.mapped("file_ids").filtered("include").mapped("name"))
-        return super().get_asset_bundle(
-            bundle_name,
-            [file for file in files if file["url"] in names],
-            env=env,
-            css=css,
-            js=js,
-        )
-
-    def _get_asset_nodes(
-        self,
-        bundle,
-        css=True,
-        js=True,
-        debug=False,
-        async_load=False,
-        defer_load=False,
-        lazy_load=False,
-        media=None,
-    ):
-        path = None
-        assets = self.env["web.assets"].sudo()
-        try:
-            from odoo.http import request
-
-            path = request.httprequest.path
-        except RuntimeError:  # pylint: disable=except-pass
-            pass
-
-        if path:
-            domain = [
-                ("bundle", "=", bundle),
-                ("active", "=", True),
-                ("path_regex", "!=", False),
-            ]
-            for rec in assets.search(domain):
-                pattern = r"^" + rec.path_regex.strip(r"^")
-                if re.match(pattern, path):
-                    assets = rec
-                    break
-
-        if assets:
-            bundle += f"|{assets.hashsum}"
-
-        return super(
-            IrQweb,
-            self.with_context(
-                bundle_hashsum=assets.hashsum,
-                bundle_skip_filtering=debug and "unfiltered" in debug,
-            ),
-        )._get_asset_nodes(
-            bundle,
-            css=css,
-            js=js,
-            debug=debug,
-            async_load=async_load,
-            defer_load=defer_load,
-            lazy_load=lazy_load,
-            media=media,
-        )
+        return [f for f in files if f["url"] in names], external_assets

web_assets_manager/models/web_assets.py

@@ -54,8 +54,8 @@ def action_open_files(self):
         return {
             "name": _("Assets Files"),
             "type": "ir.actions.act_window",
-            "view_mode": "tree",
-            "views": [[view.id, "tree"]],
+            "view_mode": "list",
+            "views": [[view.id, "list"]],
             "res_model": "web.assets.file",
             "domain": [("asset_id", "in", self.ids)],
             "target": "current",

web_assets_manager/views/web_assets_views.xml

@@ -51,27 +51,27 @@
     <record id="view_web_assets_tree" model="ir.ui.view">
         <field name="model">web.assets</field>
         <field name="arch" type="xml">
-            <tree decoration-muted="not active">
+            <list decoration-muted="not active">
                 <field name="active" />
                 <field name="name" />
                 <field name="bundle" />
                 <field name="path_regex" />
-            </tree>
+            </list>
         </field>
     </record>
 
     <record id="view_web_assets_file_tree" model="ir.ui.view">
         <field name="model">web.assets.file</field>
         <field name="arch" type="xml">
-            <tree decoration-muted="not include" editable="bottom">
+            <list decoration-muted="not include" editable="bottom">
                 <field name="asset_id" invisible="1" />
                 <field name="include" />
                 <field name="name" />
                 <field name="mimetype" />
                 <field name="module" />
                 <field name="size_included" />
                 <field name="size" />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -130,7 +130,7 @@
         <field name="name">Web Assets</field>
         <field name="res_model">web.assets</field>
         <field name="context">{'active_test': False}</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
 
     <menuitem