urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trail: don't generate a costly dependency when forcing sort order 

pagespec_match_list() makes the current page depend on the pagespec
being matched, so if you use [[!trailoptions sort="..."]] to force
a sort order, the trail ends up depending on internal(*) and is
rebuilt whenever anything changes. Add a new sort_pages() and use that
instead.
master
Simon McVittie 2014-07-11 22:08:08 +01:00
parent 48c310ddbd
commit 3f4a935740
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IkiWiki.pm
View File

@ -2459,6 +2459,19 @@ sub pagespec_match ($$;@) {
return $sub->($page, @params);
}
# e.g. @pages = sort_pages("title", \@pages, reverse => "yes")
#
# Not exported yet, but could be in future if it is generally useful.
# Note that this signature is not the same as IkiWiki::SortSpec::sort_pages,
# which is "more internal".
sub sort_pages ($$;@) {
my $sort = shift;
my $list = shift;
my %params = @_;
$sort = sortspec_translate($sort, $params{reverse});
return IkiWiki::SortSpec::sort_pages($sort, @$list);
}
sub pagespec_match_list ($$;@) {
my $page=shift;
my $pagespec=shift;

7
IkiWiki/Plugin/trail.pm
View File

@ -319,10 +319,9 @@ sub prerender {
}
if (defined $pagestate{$trail}{trail}{sort}) {
# re-sort
@$members = pagespec_match_list($trail, 'internal(*)',
list => $members,
sort => $pagestate{$trail}{trail}{sort});
@$members = IkiWiki::sort_pages(
$pagestate{$trail}{trail}{sort},
$members);
}
if (IkiWiki::yesno $pagestate{$trail}{trail}{reverse}) {