X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a44bfb158dac9e04647a75bc819a73bc18f5acce..485a017a88949b92b59edf49197c4c09be910665:/IkiWiki/Plugin/inline.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 61b4a8523..56adaf509 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -5,16 +5,25 @@ package IkiWiki::Plugin::inline; use warnings; use strict; use IkiWiki; +use URI; sub import { #{{{ IkiWiki::hook(type => "preprocess", id => "inline", call => \&IkiWiki::preprocess_inline); + # 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. + IkiWiki::hook(type => "change", id => "inline", + call => \&IkiWiki::pingurl); } # }}} # Back to ikiwiki namespace for the rest, this code is very much # internal to ikiwiki even though it's separated into a plugin. package IkiWiki; - + +my %toping; +my $processing_inline=0; + sub preprocess_inline (@) { #{{{ my %params=@_; @@ -27,14 +36,35 @@ sub preprocess_inline (@) { #{{{ if (! exists $params{show} && $params{archive} eq "no") { $params{show}=10; } + if (! exists $params{rss}) { + $params{rss}="yes"; + } + + # Avoid nested inlines, to avoid loops etc. + if ($processing_inline) { + return ""; + } + $processing_inline=1; + + my @list; + foreach my $page (keys %pagesources) { + next if $page eq $params{page}; + if (pagespec_match($page, $params{pages})) { + push @list, $page; + } + } + @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list; + if ($params{show} && @list > $params{show}) { + @list=@list[0..$params{show} - 1]; + } + add_depends($params{page}, $params{pages}); my $ret=""; - if (exists $params{rootpage}) { + if (exists $params{rootpage} && $config{cgiurl}) { # Add a blog post form, with a rss link button. - my $formtemplate=HTML::Template->new(blind_cache => 1, - filename => "$config{templatedir}/blogpost.tmpl"); + my $formtemplate=template("blogpost.tmpl", blind_cache => 1); $formtemplate->param(cgiurl => $config{cgiurl}); $formtemplate->param(rootpage => $params{rootpage}); if ($config{rss}) { @@ -42,65 +72,62 @@ sub preprocess_inline (@) { #{{{ } $ret.=$formtemplate->output; } - elsif ($config{rss}) { + elsif ($config{rss} && $params{rss} eq "yes") { # Add a rss link button. - my $linktemplate=HTML::Template->new(blind_cache => 1, - filename => "$config{templatedir}/rsslink.tmpl"); + my $linktemplate=template("rsslink.tmpl", blind_cache => 1); $linktemplate->param(rssurl => rsspage(basename($params{page}))); $ret.=$linktemplate->output; } - my $template=HTML::Template->new(blind_cache => 1, - filename => (($params{archive} eq "no") - ? "$config{templatedir}/inlinepage.tmpl" - : "$config{templatedir}/inlinepagetitle.tmpl")); + my $template=template( + (($params{archive} eq "no") + ? "inlinepage.tmpl" + : "inlinepagetitle.tmpl"), + blind_cache => 1, + ); - my @pages; - foreach my $page (blog_list($params{pages}, $params{show})) { - next if $page eq $params{page}; - push @pages, $page; - $template->param(pagelink => htmllink($params{page}, $page)); - $template->param(content => get_inline_content($params{page}, $page)) + foreach my $page (@list) { + # Don't use htmllink because this way the title is separate + # and can be overridden by other plugins. + my $link=htmlpage(bestlink($params{page}, $page)); + $link=abs2rel($link, dirname($params{page})); + $template->param(pageurl => $link); + $template->param(title => pagetitle(basename($page))); + $template->param(content => get_inline_content($page, $params{page})) if $params{archive} eq "no"; - $template->param(ctime => scalar(gmtime($pagectime{$page}))); + $template->param(ctime => displaytime($pagectime{$page})); + + run_hooks(pagetemplate => sub { + shift->(page => $page, destpage => $params{page}, + template => $template,); + }); + $ret.=$template->output; + $template->clear_params; } # TODO: should really add this to renderedfiles and call # check_overwrite, but currently renderedfiles # only supports listing one file per page. - if ($config{rss}) { + if ($config{rss} && $params{rss} eq "yes") { writefile(rsspage($params{page}), $config{destdir}, - genrss($params{page}, @pages)); + genrss($params{page}, @list)); + $toping{$params{page}}=1 unless $config{rebuild}; } - return $ret; -} #}}} - -sub blog_list ($$) { #{{{ - my $globlist=shift; - my $maxitems=shift; - - my @list; - foreach my $page (keys %pagesources) { - if (globlist_match($page, $globlist)) { - push @list, $page; - } - } + $processing_inline=0; - @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list; - return @list if ! $maxitems || @list <= $maxitems; - return @list[0..$maxitems - 1]; + return $ret; } #}}} sub get_inline_content ($$) { #{{{ - my $parentpage=shift; my $page=shift; + my $destpage=shift; my $file=$pagesources{$page}; my $type=pagetype($file); - if ($type ne 'unknown') { - return htmlize($type, linkify(readfile(srcfile($file)), $parentpage)); + if (defined $type) { + return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file))))); } else { return ""; @@ -111,7 +138,11 @@ sub date_822 ($) { #{{{ my $time=shift; eval q{use POSIX}; - return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time)); + my $lc_time= POSIX::setlocale(&POSIX::LC_TIME); + POSIX::setlocale(&POSIX::LC_TIME, "C"); + my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time)); + POSIX::setlocale(&POSIX::LC_TIME, $lc_time); + return $ret; } #}}} sub absolute_urls ($$) { #{{{ @@ -121,8 +152,8 @@ sub absolute_urls ($$) { #{{{ $url=~s/[^\/]+$//; - $content=~s/new(blind_cache => 1, - filename => "$config{templatedir}/rsspage.tmpl"); + my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page))); - my @items; + my $itemtemplate=template("rssitem.tmpl", blind_cache => 1, + die_on_bad_params => 0); + my $content=""; foreach my $p (@pages) { - push @items, { - itemtitle => pagetitle(basename($p)), - itemurl => "$config{url}/$renderedfiles{$p}", - itempubdate => date_822($pagectime{$p}), - itemcontent => absolute_urls(get_inline_content($page, $p), $url), - } if exists $renderedfiles{$p}; + next unless exists $renderedfiles{$p}; + + my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}")); + + $itemtemplate->param( + title => pagetitle(basename($p)), + url => $u, + permalink => $u, + pubdate => date_822($pagectime{$p}), + content => absolute_urls(get_inline_content($p, $page), $url), + ); + run_hooks(pagetemplate => sub { + shift->(page => $p, destpage => $page, + template => $itemtemplate); + }); + + $content.=$itemtemplate->output; + $itemtemplate->clear_params; } + my $template=template("rsspage.tmpl", blind_cache => 1); $template->param( title => $config{wikiname}, + wikiname => $config{wikiname}, pageurl => $url, - items => \@items, + content => $content, ); + run_hooks(pagetemplate => sub { + shift->(page => $page, destpage => $page, + template => $template); + }); return $template->output; } #}}} +sub pingurl (@) { #{{{ + return unless $config{pingurl} && %toping; + + eval q{require RPC::XML::Client}; + if ($@) { + debug("RPC::XML::Client not found, not pinging"); + return; + } + + foreach my $page (keys %toping) { + my $title=pagetitle(basename($page)); + my $url="$config{url}/".htmlpage($page); + foreach my $pingurl (@{$config{pingurl}}) { + my $client = RPC::XML::Client->new($pingurl); + my $req = RPC::XML::request->new('weblogUpdates.ping', + $title, $url); + debug("Pinging $pingurl for $page"); + my $res = $client->send_request($req); + if (! ref $res) { + debug("Did not receive response to ping"); + } + my $r=$res->value; + if (! exists $r->{flerror} || $r->{flerror}) { + debug("Ping rejected: ".$r->{message}); + } + } + } +} #}}} + 1