Skip to content

cache isCached state for scss resources - #10377

Merged
MorrisJobke merged 2 commits into
masterfrom
sccs-cache-iscached
Jul 25, 2018
Merged

cache isCached state for scss resources#10377
MorrisJobke merged 2 commits into
masterfrom
sccs-cache-iscached

Conversation

@icewind1991

Copy link
Copy Markdown
Member

This saves a significant amount of filecache operations when loading a page.

This extra caching layer is disabled when debug mode is enabled to ensure it doesn't get in the way of development

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991icewind1991 added the 3. to review Waiting for reviews label Jul 24, 2018
@icewind1991icewind1991 added this to the Nextcloud 14 milestone Jul 24, 2018
@skjnldsvskjnldsv added feature: scss feature: caching Related to our caching system: scssCacher, jsCombiner... enhancement labels Jul 24, 2018

@skjnldsvskjnldsv left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code make sense! :)

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Teste and works 👍

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 24, 2018
@MorrisJobke

MorrisJobke commented Jul 24, 2018

Copy link
Copy Markdown
Member

Unit tests fail:

1) Test\Template\SCSSCacherTest::testIsCachedNoFile
TypeError: Argument 2 passed to OC\Template\SCSSCacher::isCached() must be of the type string, object given
/drone/src/github.com/nextcloud/server/lib/private/Template/SCSSCacher.php:181
/drone/src/github.com/nextcloud/server/tests/lib/TestCase.php:210
/drone/src/github.com/nextcloud/server/tests/lib/Template/SCSSCacherTest.php:262
2) Test\Template\SCSSCacherTest::testIsCachedNoDepsFile
TypeError: Argument 2 passed to OC\Template\SCSSCacher::isCached() must be of the type string, object given
/drone/src/github.com/nextcloud/server/lib/private/Template/SCSSCacher.php:181
/drone/src/github.com/nextcloud/server/tests/lib/TestCase.php:210
/drone/src/github.com/nextcloud/server/tests/lib/Template/SCSSCacherTest.php:283

@MorrisJobkeMorrisJobke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Jul 25, 2018
@MorrisJobkeMorrisJobke mentioned this pull request Jul 25, 2018
21 tasks
@MorrisJobke

Copy link
Copy Markdown
Member

Let me check if I can fix the tests.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

Copy link
Copy Markdown
Member

Let me check if I can fix the tests.

Fixed them. They worked locally. Let's wait for CI then.

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Jul 25, 2018
@MorrisJobke
MorrisJobke merged commit 8255faa into masterJul 25, 2018
@MorrisJobke
MorrisJobke deleted the sccs-cache-iscached branch July 25, 2018 15:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishenhancementfeature: cachingRelated to our caching system: scssCacher, jsCombiner...feature: scss

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@MorrisJobke@skjnldsv