X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d1c4899a22c99febfd46d6f2e28803ecf5d7288f..a4dc0f997c2d64c21e08d06382b9f3c3987a681f:/IkiWiki/Plugin/inline.pm
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ae3f8f409..c734bd9a6 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -10,6 +10,7 @@ use URI;
my %knownfeeds;
my %page_numfeeds;
+my @inline;
sub import { #{{{
hook(type => "getopt", id => "inline", call => \&getopt);
@@ -19,6 +20,7 @@ sub import { #{{{
call => \&IkiWiki::preprocess_inline);
hook(type => "pagetemplate", id => "inline",
call => \&IkiWiki::pagetemplate_inline);
+ hook(type => "format", id => "inline", call => \&format);
# Hook to change to do pinging since it's called late.
# This ensures each page only pings once and prevents slow
# pings interrupting page builds.
@@ -34,6 +36,8 @@ sub getopt () { #{{{
GetOptions(
"rss!" => \$config{rss},
"atom!" => \$config{atom},
+ "allowrss!" => \$config{allowrss},
+ "allowatom!" => \$config{allowatom},
);
}
@@ -49,6 +53,17 @@ sub checkconfig () { #{{{
}
} #}}}
+sub format (@) { #{{{
+ my %params=@_;
+
+ # Fill in the inline content generated earlier. This is actually an
+ # optimisation.
+ $params{content}=~s{}{
+ delete @inline[$1,]
+ }eg;
+ return $params{content};
+} #}}}
+
sub sessioncgi () { #{{{
my $q=shift;
my $session=shift;
@@ -91,18 +106,22 @@ sub preprocess_inline (@) { #{{{
}
my $raw=yesno($params{raw});
my $archive=yesno($params{archive});
- my $rss=($config{rss} && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
- my $atom=($config{atom} && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
+ my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
+ my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
my $feedonly=yesno($params{feedonly});
if (! exists $params{show} && ! $archive) {
$params{show}=10;
}
+ if (! exists $params{feedshow} && exists $params{show}) {
+ $params{feedshow}=$params{show};
+ }
my $desc;
if (exists $params{description}) {
$desc = $params{description}
- } else {
+ }
+ else {
$desc = $config{wikiname};
}
my $actions=yesno($params{actions});
@@ -142,6 +161,17 @@ sub preprocess_inline (@) { #{{{
@list=@list[$params{skip} .. scalar @list - 1];
}
+ my @feedlist;
+ if ($feeds) {
+ if (exists $params{feedshow} &&
+ $params{feedshow} && @list > $params{feedshow}) {
+ @feedlist=@list[0..$params{feedshow} - 1];
+ }
+ else {
+ @feedlist=@list;
+ }
+ }
+
if ($params{show} && @list > $params{show}) {
@list=@list[0..$params{show} - 1];
}
@@ -150,12 +180,7 @@ sub preprocess_inline (@) { #{{{
# Explicitly add all currently displayed pages as dependencies, so
# that if they are removed or otherwise changed, the inline will be
# sure to be updated.
- add_depends($params{page}, join(" or ", @list));
- # Force a scan of this page so any metadata that appears after this
- # inline directive is available when inlining. The page normally
- # wouldn't be scanned if it's only being rebuilt because of a
- # depedency.
- IkiWiki::scan($pagesources{$params{page}});
+ add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
my $feednum="";
@@ -181,7 +206,7 @@ sub preprocess_inline (@) { #{{{
my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
my $ret="";
- if ($config{cgiurl} && (exists $params{rootpage} ||
+ if ($config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
(exists $params{postform} && yesno($params{postform})))) {
# Add a blog post form, with feed buttons.
my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
@@ -200,7 +225,7 @@ sub preprocess_inline (@) { #{{{
}
$ret.=$formtemplate->output;
}
- elsif ($feeds) {
+ elsif ($feeds && !$params{preview}) {
# Add feed buttons.
my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
$linktemplate->param(rssurl => $rssurl) if $rss;
@@ -277,32 +302,36 @@ sub preprocess_inline (@) { #{{{
}
if ($feeds) {
- if (exists $params{feedshow} && @list > $params{feedshow}) {
- @list=@list[0..$params{feedshow} - 1];
- }
if (exists $params{feedpages}) {
- @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
+ @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
}
- if ($rss && ! $params{preview}) {
+ if ($rss) {
my $rssp=rsspage($params{destpage}).$feednum;
will_render($params{destpage}, $rssp);
- writefile($rssp, $config{destdir},
- genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
- $toping{$params{destpage}}=1 unless $config{rebuild};
- $feedlinks{$params{destpage}}=qq{};
+ if (! $params{preview}) {
+ writefile($rssp, $config{destdir},
+ genfeed("rss",
+ $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));
+ $toping{$params{destpage}}=1 unless $config{rebuild};
+ $feedlinks{$params{destpage}}=qq{};
+ }
}
- if ($atom && ! $params{preview}) {
+ if ($atom) {
my $atomp=atompage($params{destpage}).$feednum;
will_render($params{destpage}, $atomp);
- writefile($atomp, $config{destdir},
- genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
- $toping{$params{destpage}}=1 unless $config{rebuild};
- $feedlinks{$params{destpage}}=qq{};
+ if (! $params{preview}) {
+ writefile($atomp, $config{destdir},
+ genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));
+ $toping{$params{destpage}}=1 unless $config{rebuild};
+ $feedlinks{$params{destpage}}=qq{};
+ }
}
}
- return $ret;
+ return $ret if $raw;
+ push @inline, $ret;
+ return "\n\n";
} #}}}
sub pagetemplate_inline (@) { #{{{
@@ -361,8 +390,8 @@ sub absolute_urls ($$) { #{{{
$url=~s/[^\/]+$//;
$content=~s/(