Xavier-Do
5594d8f191
One of the most costly part of a page loading when the ormcache is cold is computing the assets node, the unique identifier of an attachment to validate whether the existing attachment is still valid with the current version of the static files. This operation needs to glob assets path in the filesystem, get the modification date, check attachments, ... Right now this task is not really optimized and can take some time because of an excessive number of glob on the filesystem, unnecessary exists to define absolute path, double computation of file list and modified times when getting js and css bundle separately, ... A list of modifications mainly discussed in the pr message are made with this commit to speedup things. - split css and js unique - prepare api for an in memory glob - change api to propagate absolute path and meta information through `ir.asset._get_paths`-> _get_asset_paths -> `_get_asset_content` -> `AssetsBundle` closes odoo/odoo#121159 Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
193 lines
8.8 KiB
Python
193 lines
8.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
import re
|
|
import logging
|
|
|
|
from collections import OrderedDict
|
|
|
|
from odoo import models
|
|
from odoo.http import request
|
|
from odoo.tools import lazy
|
|
from odoo.addons.base.models.assetsbundle import AssetsBundle
|
|
from odoo.addons.http_routing.models.ir_http import url_for
|
|
from odoo.osv import expression
|
|
from odoo.addons.website.models import ir_http
|
|
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
re_background_image = re.compile(r"(background-image\s*:\s*url\(\s*['\"]?\s*)([^)'\"]+)")
|
|
|
|
|
|
class AssetsBundleMultiWebsite(AssetsBundle):
|
|
def _get_asset_url_values(self, id, unique, extra, name, sep, extension):
|
|
website_id = self.env.context.get('website_id')
|
|
website_id_path = website_id and ('%s/' % website_id) or ''
|
|
extra = website_id_path + extra
|
|
res = super(AssetsBundleMultiWebsite, self)._get_asset_url_values(id, unique, extra, name, sep, extension)
|
|
return res
|
|
|
|
def get_debug_asset_url(self, extra='', name='%', extension='%'):
|
|
website_id = self.env.context.get('website_id')
|
|
website_id_path = website_id and ('%s/' % website_id) or ''
|
|
extra = website_id_path + extra
|
|
return super(AssetsBundleMultiWebsite, self).get_debug_asset_url(extra, name, extension)
|
|
|
|
class IrQWeb(models.AbstractModel):
|
|
""" IrQWeb object for rendering stuff in the website context """
|
|
|
|
_inherit = 'ir.qweb'
|
|
|
|
URL_ATTRS = {
|
|
'form': 'action',
|
|
'a': 'href',
|
|
'link': 'href',
|
|
'script': 'src',
|
|
'img': 'src',
|
|
}
|
|
|
|
# assume cache will be invalidated by third party on write to ir.ui.view
|
|
def _get_template_cache_keys(self):
|
|
""" Return the list of context keys to use for caching ``_compile``. """
|
|
return super()._get_template_cache_keys() + ['website_id']
|
|
|
|
def _prepare_frontend_environment(self, values):
|
|
""" Update the values and context with website specific value
|
|
(required to render website layout template)
|
|
"""
|
|
irQweb = super()._prepare_frontend_environment(values)
|
|
|
|
current_website = request.website
|
|
editable = request.env.user.has_group('website.group_website_designer')
|
|
translatable = editable and irQweb.env.context.get('lang') != irQweb.env['ir.http']._get_default_lang().code
|
|
editable = editable and not translatable
|
|
|
|
has_group_restricted_editor = irQweb.env.user.has_group('website.group_website_restricted_editor')
|
|
if has_group_restricted_editor and irQweb.env.user.has_group('website.group_multi_website'):
|
|
values['multi_website_websites_current'] = lazy(lambda: current_website.name)
|
|
values['multi_website_websites'] = lazy(lambda: [
|
|
{'website_id': website.id, 'name': website.name, 'domain': website.domain}
|
|
for website in current_website.search([('id', '!=', current_website.id)])
|
|
])
|
|
|
|
cur_company = irQweb.env.company
|
|
values['multi_website_companies_current'] = lazy(lambda: {'company_id': cur_company.id, 'name': cur_company.name})
|
|
values['multi_website_companies'] = lazy(lambda: [
|
|
{'company_id': comp.id, 'name': comp.name}
|
|
for comp in irQweb.env.user.company_ids if comp != cur_company
|
|
])
|
|
|
|
# update values
|
|
|
|
values.update(dict(
|
|
website=current_website,
|
|
is_view_active=lazy(lambda: current_website.is_view_active),
|
|
res_company=lazy(request.env['res.company'].browse(current_website._get_cached('company_id')).sudo),
|
|
translatable=translatable,
|
|
editable=editable,
|
|
))
|
|
|
|
if editable:
|
|
# form editable object, add the backend configuration link
|
|
if 'main_object' in values and has_group_restricted_editor:
|
|
func = getattr(values['main_object'], 'get_backend_menu_id', False)
|
|
values['backend_menu_id'] = lazy(lambda: func and func() or irQweb.env['ir.model.data']._xmlid_to_res_id('website.menu_website_configuration'))
|
|
|
|
# update options
|
|
|
|
irQweb = irQweb.with_context(website_id=current_website.id)
|
|
|
|
if 'inherit_branding' not in irQweb.env.context and not self.env.context.get('rendering_bundle'):
|
|
if editable:
|
|
# in edit mode add brancding on ir.ui.view tag nodes
|
|
irQweb = irQweb.with_context(inherit_branding=True)
|
|
elif has_group_restricted_editor and not translatable:
|
|
# will add the branding on fields (into values)
|
|
irQweb = irQweb.with_context(inherit_branding_auto=True)
|
|
|
|
return irQweb
|
|
|
|
def _get_asset_bundle(self, xmlid, files, env=None, css=True, js=True, debug=False):
|
|
return AssetsBundleMultiWebsite(xmlid, files, env=env, css=css, js=js, debug=debug)
|
|
|
|
def _post_processing_att(self, tagName, atts):
|
|
if atts.get('data-no-post-process'):
|
|
return atts
|
|
|
|
atts = super()._post_processing_att(tagName, atts)
|
|
|
|
website = ir_http.get_request_website()
|
|
if not website and self.env.context.get('website_id'):
|
|
website = self.env['website'].browse(self.env.context['website_id'])
|
|
if website and tagName == 'img' and 'loading' not in atts:
|
|
atts['loading'] = 'lazy' # default is auto
|
|
|
|
if self.env.context.get('inherit_branding') or self.env.context.get('rendering_bundle') or \
|
|
self.env.context.get('edit_translations') or self.env.context.get('debug') or (request and request.session.debug):
|
|
return atts
|
|
|
|
if not website:
|
|
return atts
|
|
|
|
name = self.URL_ATTRS.get(tagName)
|
|
if request and name and name in atts:
|
|
atts[name] = url_for(atts[name])
|
|
|
|
if not website.cdn_activated:
|
|
return atts
|
|
|
|
data_name = f'data-{name}'
|
|
if name and (name in atts or data_name in atts):
|
|
atts = OrderedDict(atts)
|
|
if name in atts:
|
|
atts[name] = website.get_cdn_url(atts[name])
|
|
if data_name in atts:
|
|
atts[data_name] = website.get_cdn_url(atts[data_name])
|
|
if isinstance(atts.get('style'), str) and 'background-image' in atts['style']:
|
|
atts = OrderedDict(atts)
|
|
atts['style'] = re_background_image.sub(lambda m: '%s%s' % (m.group(1), website.get_cdn_url(m.group(2))), atts['style'])
|
|
|
|
return atts
|
|
|
|
def _pregenerate_assets_bundles(self):
|
|
# website is adding a website_id to the extra part of the attachement url (/1)
|
|
|
|
# /web/assets/2224-47bce88/1/web.assets_frontend.min.css
|
|
# /web/assets/2226-17d3428/1/web.assets_frontend_minimal.min.js
|
|
# /web/assets/2227-b9cd4ba/1/web.assets_tests.min.js
|
|
# /web/assets/2229-25b1d52/1/web.assets_frontend_lazy.min.js
|
|
|
|
# this means that the previously generated attachment wont be used on the website
|
|
# the main reason is to avoid invalidating other website attachement, but the
|
|
# version part combine with the initial extra (rtl) should be enough to ensure they are identical.
|
|
# we dont expect to have any pregenerated rtl/website attachment so we don't manage assets with extra
|
|
|
|
nodes = super()._pregenerate_assets_bundles()
|
|
website = self.env['website'].search([], order='id', limit=1)
|
|
if not website:
|
|
return nodes
|
|
nb_created = 0
|
|
for node in nodes:
|
|
bundle_info = node[1]
|
|
bundle_url = bundle_info.get('src', '') or bundle_info.get('href', '')
|
|
if bundle_url.startswith('/web/assets/'):
|
|
# example: "/web/assets/2152-ee56665/web.assets_frontend_lazy.min.js"
|
|
_, _, _, id_unique, name = bundle_url.split('/')
|
|
attachment_id, unique = id_unique.split('-')
|
|
url_pattern = f'/web/assets/%s-%s/{website.id}/{name}'
|
|
existing = self.env['ir.attachment'].search([('url', '=like', url_pattern % ('%', '%'))])
|
|
if existing:
|
|
if f'-{unique}/' in existing.url:
|
|
continue
|
|
_logger.runbot(f'Updating exiting assets {existing.url} for website {website.id}')
|
|
# we assume that most of the time the first website bundles will be the same as the base one
|
|
# if the unique changes, it is most likely because sources where update since install.
|
|
# this is mainly for dev downloading a database from runbot and trying to execute tests locally
|
|
existing.unlink()
|
|
new = self.env['ir.attachment'].browse(int(attachment_id)).copy()
|
|
new.url = url_pattern % (new.id, unique)
|
|
nb_created += 1
|
|
if nb_created:
|
|
_logger.runbot('%s bundle(s) were copied for website %s', nb_created, website.id)
|
|
|
|
return nodes
|