From cd849db8be9bf7712ff216e81c3d134087be0eb1 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 6 Nov 2020 11:26:53 +0100 Subject: [PATCH 1/2] Avoid SCSS compilation if not needed Now we do on each template load a compile with the SCSS variables to see if they changed or not. However there is no real reason for this if the variables didn't change. Signed-off-by: Roeland Jago Douma --- lib/private/Template/SCSSCacher.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index 225078ff6a..1c6ca66183 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -283,8 +283,9 @@ class SCSSCacher { * @return bool */ private function variablesChanged(): bool { - $injectedVariables = $this->getInjectedVariables(); - if ($this->config->getAppValue('core', 'theming.variables') !== md5($injectedVariables)) { + $cachedVariables = $this->config->getAppValue('core', 'theming.variables', ''); + $injectedVariables = $this->getInjectedVariables($cachedVariables); + if ($cachedVariables !== md5($injectedVariables)) { $this->logger->debug('SCSSCacher::variablesChanged storedVariables: ' . json_encode($this->config->getAppValue('core', 'theming.variables')) . ' currentInjectedVariables: ' . json_encode($injectedVariables), ['app' => 'scss_cacher']); $this->config->setAppValue('core', 'theming.variables', md5($injectedVariables)); $this->resetCache(); @@ -411,7 +412,7 @@ class SCSSCacher { /** * @return string SCSS code for variables from OC_Defaults */ - private function getInjectedVariables(): string { + private function getInjectedVariables(string $cache = ''): string { if ($this->injectedVariables !== null) { return $this->injectedVariables; } @@ -420,6 +421,15 @@ class SCSSCacher { $variables .= '$' . $key . ': ' . $value . ' !default;'; } + /* + * If we are trying to return the same variables as that are cached + * Then there is no need to do the compile step + */ + if ($cache === md5($variables)) { + $this->injectedVariables = $variables; + return $variables; + } + // check for valid variables / otherwise fall back to defaults try { $scss = new Compiler(); From 3e6e9186d8d93fe86cfed3fab4bfc7b91cdf73ef Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 6 Nov 2020 22:53:33 +0100 Subject: [PATCH 2/2] Fix tests to return config default values Signed-off-by: Morris Jobke --- tests/lib/Template/SCSSCacherTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index 77a9bdde76..4295c800d0 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -81,6 +81,11 @@ class SCSSCacherTest extends \Test\TestCase { ->willReturn('http://localhost/nextcloud'); $this->config = $this->createMock(IConfig::class); + $this->config->expects($this->any()) + ->method('getAppValue') + ->will($this->returnCallback(function ($appId, $configKey, $defaultValue) { + return $defaultValue; + })); $this->cacheFactory = $this->createMock(ICacheFactory::class); $this->depsCache = $this->createMock(ICache::class); $this->cacheFactory->expects($this->at(0))