X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/594a9194561ad373a31a7d34c6b5c7a84ec417a0..1d4ddbb9eb140b9bafe5091143473a52e03887c5:/IkiWiki/Plugin/inline.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d89e14197..c3895d982 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -19,14 +19,14 @@ sub import {
hook(type => "checkconfig", id => "inline", call => \&checkconfig);
hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
hook(type => "preprocess", id => "inline",
- call => \&IkiWiki::preprocess_inline);
+ call => \&IkiWiki::preprocess_inline, scan => 1);
hook(type => "pagetemplate", id => "inline",
call => \&IkiWiki::pagetemplate_inline);
hook(type => "format", id => "inline", call => \&format, first => 1);
# 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.
- hook(type => "change", id => "inline", call => \&IkiWiki::pingurl);
+ hook(type => "rendered", id => "inline", call => \&IkiWiki::pingurl);
}
sub getopt () {
@@ -119,7 +119,7 @@ sub sessioncgi ($$) {
my $session=shift;
if ($q->param('do') eq 'blog') {
- my $page=titlepage(decode_utf8($q->param('title')));
+ my $page=titlepage(decode_utf8(scalar $q->param('title')));
$page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs
# if the page already exists, munge it to be unique
my $from=$q->param('from');
@@ -155,6 +155,24 @@ sub preprocess_inline (@) {
if (! exists $params{pages} && ! exists $params{pagenames}) {
error gettext("missing pages parameter");
}
+
+ if (! defined wantarray) {
+ # Running in scan mode: only do the essentials
+
+ if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) {
+ # default to sorting by age with fallback to title,
+ # the same as inline itself, but let the params
+ # override that
+ IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age title', %params);
+ }
+
+ return;
+ }
+
+ if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) {
+ scalar IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age title', %params);
+ }
+
my $raw=yesno($params{raw});
my $archive=yesno($params{archive});
my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
@@ -163,11 +181,29 @@ sub preprocess_inline (@) {
my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick && ! $raw;
my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
my $feedonly=yesno($params{feedonly});
- if (! exists $params{show} && ! $archive) {
- $params{show}=10;
+
+ # Backwards compatibility
+ if (defined $params{show} && $params{show} =~ m/^\d+$/) {
+ $params{limit} = $params{show};
+ delete $params{show};
+ }
+ if (defined $params{feedshow} && $params{feedshow} =~ m/^\d+$/) {
+ $params{feedlimit} = $params{feedshow};
+ delete $params{feedshow};
+ }
+
+ if (! exists $params{limit} && ! $archive) {
+ $params{limit}=10;
+ }
+ if (! exists $params{feedlimit} && exists $params{limit}) {
+ $params{feedlimit}=$params{limit};
}
- if (! exists $params{feedshow} && exists $params{show}) {
- $params{feedshow}=$params{show};
+ my $title;
+ if (exists $params{title}) {
+ $title = $params{title};
+ }
+ else {
+ $title = $params{page} ne "index" ? pagetitle($params{page}) : $config{wikiname};
}
my $desc;
if (exists $params{description}) {
@@ -194,8 +230,7 @@ sub preprocess_inline (@) {
}
}
- @list = map { bestlink($params{page}, $_) }
- split ' ', $params{pagenames};
+ @list = split ' ', $params{pagenames};
if (yesno($params{reverse})) {
@list=reverse(@list);
@@ -204,14 +239,16 @@ sub preprocess_inline (@) {
foreach my $p (@list) {
add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
}
+
+ @list = grep { exists $pagesources{$_} } @list;
}
else {
my $num=0;
- if ($params{show}) {
- $num=$params{show};
+ if ($params{limit}) {
+ $num=$params{limit};
}
- if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {
- $num=$params{feedshow};
+ if ($params{feedlimit} && $num < $params{feedlimit} && $num > 0) {
+ $num=$params{feedlimit};
}
if ($params{skip} && $num) {
$num+=$params{skip};
@@ -220,7 +257,7 @@ sub preprocess_inline (@) {
@list = pagespec_match_list($params{page}, $params{pages},
deptype => deptype($quick ? "presence" : "content"),
filter => sub { $_[0] eq $params{page} },
- sort => exists $params{sort} ? $params{sort} : "age",
+ sort => exists $params{sort} ? $params{sort} : "age title",
reverse => yesno($params{reverse}),
($num ? (num => $num) : ()),
);
@@ -232,17 +269,17 @@ sub preprocess_inline (@) {
my @feedlist;
if ($feeds) {
- if (exists $params{feedshow} &&
- $params{feedshow} && @list > $params{feedshow}) {
- @feedlist=@list[0..$params{feedshow} - 1];
+ if (exists $params{feedlimit} &&
+ $params{feedlimit} && @list > $params{feedlimit}) {
+ @feedlist=@list[0..$params{feedlimit} - 1];
}
else {
@feedlist=@list;
}
}
- if ($params{show} && @list > $params{show}) {
- @list=@list[0..$params{show} - 1];
+ if ($params{limit} && @list > $params{limit}) {
+ @list=@list[0..$params{limit} - 1];
}
if ($feeds && exists $params{feedpages}) {
@@ -294,18 +331,22 @@ sub preprocess_inline (@) {
if ($feeds) {
if ($rss) {
$rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage})));
- $rssdesc = gettext("%s (RSS feed)", $desc);
+ $rssdesc = sprintf(gettext("%s (RSS feed)"), $desc);
}
if ($atom) {
$atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage})));
- $atomdesc = gettext("%s (Atom feed)", $desc);
+ $atomdesc = sprintf(gettext("%s (Atom feed)"), $desc);
}
}
my $ret="";
- if (length $config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
- (exists $params{postform} && yesno($params{postform}))) &&
+ my $postform = (exists $params{rootpage});
+ if (exists $params{postform}) {
+ $postform = yesno($params{postform});
+ }
+
+ if (length $config{cgiurl} && ! $params{preview} && $postform &&
IkiWiki->can("cgi_editpage")) {
# Add a blog post form, with feed buttons.
my $formtemplate=template_depends("blogpost.tmpl", $params{page}, blind_cache => 1);
@@ -329,6 +370,10 @@ sub preprocess_inline (@) {
$formtemplate->param(postformtext =>
gettext("Add a new post titled:"));
}
+ if (exists $params{id}) {
+ $formtemplate->param(postformid =>
+ $params{id});
+ }
$ret.=$formtemplate->output;
# The post form includes the feed buttons, so
@@ -346,6 +391,9 @@ sub preprocess_inline (@) {
$linktemplate->param(atomurl => $atomurl);
$linktemplate->param(atomdesc => $atomdesc);
}
+ if (exists $params{id}) {
+ $linktemplate->param(id => $params{id});
+ }
$ret.=$linktemplate->output;
}
@@ -359,7 +407,9 @@ sub preprocess_inline (@) {
blind_cache => 1);
};
if ($@) {
- error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $@";
+ # gettext can clobber $@
+ my $error = $@;
+ error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $error";
}
}
my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
@@ -440,7 +490,7 @@ sub preprocess_inline (@) {
if (! $params{preview}) {
writefile($rssp, $config{destdir},
genfeed("rss",
- $config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
+ $config{url}."/".$rssp, $title, $desc, $params{guid}, $params{page}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}.=qq{};
}
@@ -450,7 +500,7 @@ sub preprocess_inline (@) {
will_render($params{destpage}, $atomp);
if (! $params{preview}) {
writefile($atomp, $config{destdir},
- genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
+ genfeed("atom", $config{url}."/".$atomp, $title, $desc, $params{guid}, $params{page}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}.=qq{};
}
@@ -499,7 +549,7 @@ sub get_inline_content ($$) {
if (isinternal($page)) {
# make inlined text of internal pages searchable
run_hooks(indexhtml => sub {
- shift->(page => $page, destpage => $page,
+ shift->(page => $page, destpage => $destpage,
content => $ret);
});
}
@@ -557,13 +607,15 @@ sub absolute_urls ($$) {
next unless $v_offset; # 0 v_offset means no value
my $v = substr($text, $v_offset, $v_len);
$v =~ s/^([\'\"])(.*)\1$/$2/;
- if ($v=~/^#/) {
+ eval q{use HTML::Entities};
+ my $dv = decode_entities($v);
+ if ($dv=~/^#/) {
$v=$baseurl.$v; # anchor
}
- elsif ($v=~/^(?!\w+:)[^\/]/) {
- $v=$url.$v; # relative url
+ elsif ($dv=~/^(?!\w+:)[^\/]/) {
+ $v=URI->new_abs($v, $url)->canonical; # relative url
}
- elsif ($v=~/^\//) {
+ elsif ($dv=~/^\//) {
if (! defined $urltop) {
# what is the non path part of the url?
my $top_uri = URI->new($url);
@@ -584,9 +636,30 @@ sub absolute_urls ($$) {
return $ret;
}
+sub genenclosure {
+ my $itemtemplate=shift;
+ my $url=shift;
+ my $file=shift;
+
+ return unless $itemtemplate->query(name => "enclosure");
+
+ my $size=(srcfile_stat($file))[8];
+ my $mime="unknown";
+ eval q{use File::MimeInfo};
+ if (! $@) {
+ $mime = mimetype($file);
+ }
+ $itemtemplate->param(
+ enclosure => $url,
+ type => $mime,
+ length => $size,
+ );
+}
+
sub genfeed ($$$$$@) {
my $feedtype=shift;
my $feedurl=shift;
+ my $feedtitle=shift;
my $feeddesc=shift;
my $guid=shift;
my $page=shift;
@@ -600,6 +673,7 @@ sub genfeed ($$$$$@) {
foreach my $p (@pages) {
my $u=URI->new(encode_utf8(urlto($p, "", 1)));
my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
+ my $fancy_enclosure_seen = 0;
$itemtemplate->param(
title => pagetitle(basename($p)),
@@ -621,32 +695,23 @@ sub genfeed ($$$$$@) {
$itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
$itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
}
- }
- if ($itemtemplate->query(name => "enclosure")) {
- my $file=$pagesources{$p};
- my $type=pagetype($file);
- if (defined $type) {
- $itemtemplate->param(content => $pcontent);
- }
- else {
- my $size=(srcfile_stat($file))[8];
- my $mime="unknown";
- eval q{use File::MimeInfo};
- if (! $@) {
- $mime = mimetype($file);
- }
- $itemtemplate->param(
- enclosure => $u,
- type => $mime,
- length => $size,
- );
+ if (exists $pagestate{$p}{meta}{enclosure}) {
+ my $absurl = $pagestate{$p}{meta}{enclosure};
+ my $file = $pagestate{$p}{meta}{enclosurefile};
+ genenclosure($itemtemplate, $absurl, $file);
+ $fancy_enclosure_seen = 1;
}
}
- else {
- $itemtemplate->param(content => $pcontent);
+
+ my $file=$pagesources{$p};
+ unless ($fancy_enclosure_seen || defined(pagetype($file))) {
+ genenclosure($itemtemplate, $u, $file);
+ $itemtemplate->param(simplepodcast => 1);
}
+ $itemtemplate->param(content => $pcontent);
+
run_hooks(pagetemplate => sub {
shift->(page => $p, destpage => $page,
template => $itemtemplate);
@@ -660,15 +725,16 @@ sub genfeed ($$$$$@) {
my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1);
$template->param(
- title => $page ne "index" ? pagetitle($page) : $config{wikiname},
+ wants_absolute_urls => 1,
+ title => $feedtitle,
wikiname => $config{wikiname},
pageurl => $url,
content => $content,
feeddesc => $feeddesc,
guid => $guid,
feeddate => date_3339($lasttime),
+ feeddate_822 => date_822($lasttime),
feedurl => $feedurl,
- version => $IkiWiki::version,
);
run_hooks(pagetemplate => sub {
shift->(page => $page, destpage => $page,