X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/74b1b2761ac21e73376d714503aad326dd6f8fec..0cd67c515fad03797fa7792c10b507a0abb77c28:/IkiWiki/Plugin/trail.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index 098b98607..330d2a31d 100644
--- a/IkiWiki/Plugin/trail.pm
+++ b/IkiWiki/Plugin/trail.pm
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# Copyright © 2008-2011 Joey Hess
-# Copyright © 2009-2011 Simon McVittie
+# Copyright © 2009-2012 Simon McVittie
# Licensed under the GNU GPL, version 2, or any later version published by the
# Free Software Foundation
package IkiWiki::Plugin::trail;
@@ -12,67 +12,45 @@ use IkiWiki 3.00;
sub import {
hook(type => "getsetup", id => "trail", call => \&getsetup);
hook(type => "needsbuild", id => "trail", call => \&needsbuild);
- hook(type => "preprocess", id => "trail", call => \&preprocess_trail, scan => 1);
- hook(type => "preprocess", id => "trailinline", call => \&preprocess_trailinline, scan => 1);
+ hook(type => "preprocess", id => "trailoptions", call => \&preprocess_trailoptions, scan => 1);
hook(type => "preprocess", id => "trailitem", call => \&preprocess_trailitem, scan => 1);
+ hook(type => "preprocess", id => "trailitems", call => \&preprocess_trailitems, scan => 1);
hook(type => "preprocess", id => "traillink", call => \&preprocess_traillink, scan => 1);
hook(type => "pagetemplate", id => "trail", call => \&pagetemplate);
+ hook(type => "build_affected", id => "trail", call => \&build_affected);
}
-=head1 Page state
-
-If a page C<$T> is a trail, then it can have
-
-=over
-
-=item * C<$pagestate{$T}{trail}{contents}>
-
-Reference to an array of lists each containing either:
-
-=over
-
-=item * C<[link, "link"]>
-
-A link specification, pointing to the same page that C<[[link]]> would select
-
-=item * C<[pagespec, "posts/*", "age", 0]>
-
-A match by pagespec; the third array element is the sort order and the fourth
-is whether to reverse sorting
-
-=back
-
-=item * C<$pagestate{$T}{trail}{sort}>
-
-A [[ikiwiki/pagespec/sorting]] order; if absent or undef, the trail is in
-the order given by the links that form it
-
-=item * C<$pagestate{$T}{trail}{circular}>
-
-True if this trail is circular (i.e. going "next" from the last item is
-allowed, and takes you back to the first)
-
-=item * C<$pagestate{$T}{trail}{reverse}>
-
-True if C is to be reversed.
-
-=back
-
-If a page C<$M> is a member of a trail C<$T>, then it has
-
-=over
-
-=item * C<$pagestate{$M}{trail}{item}{$T}[0]>
-
-The page before this one in C<$T> at the last rebuild, or undef.
-
-=item * C<$pagestate{$M}{trail}{item}{$T}[1]>
-
-The page after this one in C<$T> at the last refresh, or undef.
-
-=back
-
-=cut
+# Page state
+#
+# If a page $T is a trail, then it can have
+#
+# * $pagestate{$T}{trail}{contents}
+# Reference to an array of lists each containing either:
+# - [link, "link"]
+# A link specification, pointing to the same page that [[link]]
+# would select
+# - [pagespec, "posts/*", "age", 0]
+# A match by pagespec; the third array element is the sort order
+# and the fourth is whether to reverse sorting
+#
+# * $pagestate{$T}{trail}{sort}
+# A sorting order; if absent or undef, the trail is in the order given
+# by the links that form it
+#
+# * $pagestate{$T}{trail}{circular}
+# True if this trail is circular (i.e. going "next" from the last item is
+# allowed, and takes you back to the first)
+#
+# * $pagestate{$T}{trail}{reverse}
+# True if C is to be reversed.
+#
+# If a page $M is a member of a trail $T, then it has
+#
+# * $pagestate{$M}{trail}{item}{$T}[0]
+# The page before this one in C<$T> at the last rebuild, or undef.
+#
+# * $pagestate{$M}{trail}{item}{$T}[1]
+# The page after this one in C<$T> at the last refresh, or undef.
sub getsetup () {
return
@@ -103,23 +81,9 @@ sub needsbuild (@) {
my $scanned = 0;
-sub preprocess_trail (@) {
+sub preprocess_trailoptions (@) {
my %params = @_;
- # avoid collecting everything in the preprocess stage if we already
- # did in the scan stage
- if (defined wantarray) {
- return "" if $scanned;
- }
- else {
- $scanned = 1;
- }
-
- # trail members from a pagespec ought to be in some sort of order,
- # and path is a nice obvious default
- $params{sortthese} = 'path' unless exists $params{sortthese};
- $params{reversethese} = 'no' unless exists $params{reversethese};
-
if (exists $params{circular}) {
$pagestate{$params{page}}{trail}{circular} =
IkiWiki::yesno($params{circular});
@@ -133,63 +97,35 @@ sub preprocess_trail (@) {
$pagestate{$params{page}}{trail}{reverse} = $params{reverse};
}
- if (exists $params{pages}) {
- push @{$pagestate{$params{page}}{trail}{contents}},
- ["pagespec" => $params{pages}, $params{sortthese},
- IkiWiki::yesno($params{reversethese})];
- }
-
- if (exists $params{pagenames}) {
- my @list = map { [link => $_] } split ' ', $params{pagenames};
- push @{$pagestate{$params{page}}{trail}{contents}}, @list;
- }
-
return "";
}
-sub preprocess_trailinline (@) {
- my %params = @_;
+sub preprocess_trailitem (@) {
+ my $link = shift;
+ shift;
- if (exists $params{sort}) {
- $params{sortthese} = $params{sort};
- delete $params{sort};
+ # avoid collecting everything in the preprocess stage if we already
+ # did in the scan stage
+ if (defined wantarray) {
+ return "" if $scanned;
}
else {
- # sort in the same order as [[plugins/inline]]'s default
- $params{sortthese} = 'age';
- }
-
- if (exists $params{reverse}) {
- $params{reversethese} = $params{reverse};
- delete $params{reverse};
+ $scanned = 1;
}
- if (exists $params{trailsort}) {
- $params{sort} = $params{trailsort};
- }
+ my %params = @_;
+ my $trail = $params{page};
- if (exists $params{trailreverse}) {
- $params{reverse} = $params{trailreverse};
- }
+ $link = linkpage($link);
- if (defined wantarray) {
- scalar preprocess_trail(%params);
+ add_link($params{page}, $link, 'trail');
+ push @{$pagestate{$params{page}}{trail}{contents}}, [link => $link];
- if (IkiWiki->can("preprocess_inline")) {
- return IkiWiki::preprocess_inline(@_);
- }
- else {
- error("trailinline directive requires the inline plugin");
- }
- }
- else {
- preprocess_trail(%params);
- }
+ return "";
}
-sub preprocess_trailitem (@) {
- my $link = shift;
- shift;
+sub preprocess_trailitems (@) {
+ my %params = @_;
# avoid collecting everything in the preprocess stage if we already
# did in the scan stage
@@ -200,13 +136,21 @@ sub preprocess_trailitem (@) {
$scanned = 1;
}
- my %params = @_;
- my $trail = $params{page};
+ # trail members from a pagespec ought to be in some sort of order,
+ # and path is a nice obvious default
+ $params{sort} = 'path' unless exists $params{sort};
+ $params{reverse} = 'no' unless exists $params{reverse};
- $link = linkpage($link);
+ if (exists $params{pages}) {
+ push @{$pagestate{$params{page}}{trail}{contents}},
+ ["pagespec" => $params{pages}, $params{sort},
+ IkiWiki::yesno($params{reverse})];
+ }
- add_link($params{page}, $link, 'trail');
- push @{$pagestate{$params{page}}{trail}{contents}}, [link => $link];
+ if (exists $params{pagenames}) {
+ my @list = map { [link => $_] } split ' ', $params{pagenames};
+ push @{$pagestate{$params{page}}{trail}{contents}}, @list;
+ }
return "";
}
@@ -309,14 +253,9 @@ sub trails_differ {
my $done_prerender = 0;
-my %origsubs;
-
sub prerender {
return if $done_prerender;
- $origsubs{render_backlinks} = \&IkiWiki::render_backlinks;
- inject(name => "IkiWiki::render_backlinks", call => \&render_backlinks);
-
%trail_to_members = ();
%member_to_trails = ();
@@ -402,18 +341,14 @@ sub prerender {
$done_prerender = 1;
}
-# This is called at about the right time that we can hijack it to render
-# extra pages.
-sub render_backlinks ($) {
- my $blc = shift;
+sub build_affected {
+ my %affected;
foreach my $member (keys %rebuild_trail_members) {
- next unless exists $pagesources{$member};
-
- IkiWiki::render($pagesources{$member}, sprintf(gettext("building %s, its previous or next page has changed"), $member));
+ $affected{$member} = sprintf(gettext("building %s, its previous or next page has changed"), $member);
}
- $origsubs{render_backlinks}($blc);
+ return %affected;
}
sub title_of ($) {