tonyair
/
silverstripe-versionfeed
mirror of https://github.com/silverstripe/silverstripe-versionfeed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimise diff generation. 

For 100 items, this change improves generation times on small diffs
(100s of bytes) 6-fold. The improvement deteriorates to about 4-fold on
diffs of 1kB.

This includes the 25% improvement from the removal of unnecessary
forTemplate calls - we pack the diffs into HTMLText and render them
later from a template anyway.
This commit is contained in:
Mateusz Uzdowski 2015-03-30 11:29:33 +13:00
parent 8a7d2ec9da
commit fd67399417
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/VersionFeed.php
View File

@ -71,24 +71,28 @@ class VersionFeed extends SiteTreeExtension {
foreach ($versions as $version) {
$changed = false;
// Check if we have something to compare with.
if (isset($previous)) {
// We have something to compare with.
$diff = $this->owner->compareVersions($version->Version, $previous->Version);
// Produce the diff fields for use in the template.
if ($version->Title != $previous->Title) {
$diffTitle = Diff::compareHTML($version->Title, $previous->Title);
$version->DiffTitle = new HTMLText();
$version->DiffTitle->setValue(
sprintf(
'<div><em>%s</em>' . $diff->Title . '</div>',
'<div><em>%s</em> ' . $diffTitle . '</div>',
_t('RSSHistory.TITLECHANGED', 'Title has changed:')
)
);
$changed = true;
}
if ($version->Content != $previous->Content) {
$diffContent = Diff::compareHTML($version->Content, $previous->Content);
$version->DiffContent = new HTMLText();
$version->DiffContent->setValue('<div>'.$diff->obj('Content')->forTemplate().'</div>');
$version->DiffContent->setValue('<div>'.$diffContent.'</div>');
$changed = true;
}
@ -112,7 +116,7 @@ class VersionFeed extends SiteTreeExtension {
if ($previous && $versions->count()<$qLimit) {
$first = clone($previous);
$first->DiffContent = new HTMLText();
$first->DiffContent->setValue('<div>' . $first->obj('Content')->forTemplate() . '</div>');
$first->DiffContent->setValue('<div>' . $first->Content . '</div>');
// Copy the link so it can be cached by SS_Cache.
$first->GeneratedLink = $first->AbsoluteLink();
$changeList->push($first);