mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23934 from nextcloud/enh/avoid_scss_compile

This commit is contained in:
John Molakvoæ 2020-11-07 10:11:50 +01:00 committed by GitHub
parent 1d0db561db 3e6e9186d8
commit d25e5366b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/private/Template/SCSSCacher.php
View File

@ -283,8 +283,9 @@ class SCSSCacher {
* @return bool * @return bool
*/ */
private function variablesChanged(): bool { private function variablesChanged(): bool {
$injectedVariables = $this->getInjectedVariables(); $cachedVariables = $this->config->getAppValue('core', 'theming.variables', '');
if ($this->config->getAppValue('core', 'theming.variables') !== md5($injectedVariables)) { $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->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->config->setAppValue('core', 'theming.variables', md5($injectedVariables));
$this->resetCache(); $this->resetCache();
@ -411,7 +412,7 @@ class SCSSCacher {
/** /**
* @return string SCSS code for variables from OC_Defaults * @return string SCSS code for variables from OC_Defaults
*/ */
private function getInjectedVariables(): string { private function getInjectedVariables(string $cache = ''): string {
if ($this->injectedVariables !== null) { if ($this->injectedVariables !== null) {
return $this->injectedVariables; return $this->injectedVariables;
} }
@ -420,6 +421,15 @@ class SCSSCacher {
$variables .= '$' . $key . ': ' . $value . ' !default;'; $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 // check for valid variables / otherwise fall back to defaults
try { try {
$scss = new Compiler(); $scss = new Compiler();

5
tests/lib/Template/SCSSCacherTest.php
View File

@ -81,6 +81,11 @@ class SCSSCacherTest extends \Test\TestCase {
->willReturn('http://localhost/nextcloud'); ->willReturn('http://localhost/nextcloud');
$this->config = $this->createMock(IConfig::class); $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->cacheFactory = $this->createMock(ICacheFactory::class);
$this->depsCache = $this->createMock(ICache::class); $this->depsCache = $this->createMock(ICache::class);
$this->cacheFactory->expects($this->at(0)) $this->cacheFactory->expects($this->at(0))