post for Don

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fc9d5f01cc0044a0b728159fb68e0fb841d25734..79e64beac72a16fd5019d23eac3614ea848afbbf 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,14 +5,18 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

+use IkiWiki::Render; # for displaytime
+use URI;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "inline", 
+       hook(type => "preprocess", id => "inline", 

                call => \&IkiWiki::preprocess_inline);
                call => \&IkiWiki::preprocess_inline);

+       hook(type => "pagetemplate", id => "inline",
+               call => \&IkiWiki::pagetemplate_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.
        # 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", 
+       hook(type => "change", id => "inline", 

                call => \&IkiWiki::pingurl);
 } # }}}
 
                call => \&IkiWiki::pingurl);
 } # }}}
 


@@ -21,24 +25,37 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
 package IkiWiki;
 
 my %toping;

+my %rsslinks;
+
+sub yesno ($) { #{{{
+       my $val=shift;
+       return (defined $val && lc($val) eq "yes");
+} #}}}

 
 sub preprocess_inline (@) { #{{{
        my %params=@_;
 
 sub preprocess_inline (@) { #{{{
        my %params=@_;

-
+       

        if (! exists $params{pages}) {
                return "";
        }
        if (! exists $params{pages}) {
                return "";
        }

-       if (! exists $params{archive}) {
-               $params{archive}="no";
-       }
-       if (! exists $params{show} && $params{archive} eq "no") {
+       my $raw=yesno($params{raw});
+       my $archive=yesno($params{archive});
+       my $rss=exists $params{rss} ? yesno($params{rss}) : 1;
+       if (! exists $params{show} && ! $archive) {

                $params{show}=10;
        }
                $params{show}=10;
        }

+       my $desc;
+       if (exists $params{description}) {
+               $desc = $params{description} 
+       } else {
+               $desc = $config{wikiname};
+       }
+       my $actions=yesno($params{actions});

 
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
 
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};

-               if (globlist_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages})) {

                        push @list, $page;
                }
        }
                        push @list, $page;
                }
        }


@@ -49,60 +66,118 @@ sub preprocess_inline (@) { #{{{
 
        add_depends($params{page}, $params{pages});
 
 
        add_depends($params{page}, $params{pages});
 

+       my $rssurl=rsspage(basename($params{page}));

        my $ret="";
        my $ret="";

-       
-       if (exists $params{rootpage}) {
+
+       if (exists $params{rootpage} && $config{cgiurl}) {

                # Add a blog post form, with a rss link button.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});
                $formtemplate->param(rootpage => $params{rootpage});
                if ($config{rss}) {
                # Add a blog post form, with a rss link button.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});
                $formtemplate->param(rootpage => $params{rootpage});
                if ($config{rss}) {

-                       $formtemplate->param(rssurl => rsspage(basename($params{page})));
+                       $formtemplate->param(rssurl => $rssurl);

                }
                $ret.=$formtemplate->output;
        }
                }
                $ret.=$formtemplate->output;
        }

-       elsif ($config{rss}) {
+       elsif ($config{rss} && $rss) {

                # Add a rss link button.
                my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
                # Add a rss link button.
                my $linktemplate=template("rsslink.tmpl", blind_cache => 1);

-               $linktemplate->param(rssurl => rsspage(basename($params{page})));
+               $linktemplate->param(rssurl => $rssurl);

                $ret.=$linktemplate->output;
        }
        
        my $template=template(
                $ret.=$linktemplate->output;
        }
        
        my $template=template(

-               (($params{archive} eq "no")
-                       ? "inlinepage.tmpl"
-                       : "inlinepagetitle.tmpl"),
+               ($archive ? "inlinepagetitle.tmpl" : "inlinepage.tmpl"),

                blind_cache => 1,
                blind_cache => 1,

-       );
+       ) unless $raw;

        
        foreach my $page (@list) {
        
        foreach my $page (@list) {

-               $template->param(pagelink => htmllink($params{page}, $params{page}, $page));
-               $template->param(content => get_inline_content($params{page}, $page))
-                       if $params{archive} eq "no";
-               $template->param(ctime => displaytime($pagectime{$page}));
-               $ret.=$template->output;
+               if (! $raw) {
+                       # Get the content before populating the template,
+                       # since getting the content uses the same template
+                       # if inlines are nested.
+                       # TODO: if $archive=1, the only reason to do this
+                       # is to let the meta plugin get page title info; so stop
+                       # calling this next line then once the meta plugin can
+                       # store that accross runs (also tags plugin).
+                       my $content=get_inline_content($page, $params{destpage});
+                       # 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{destpage}));
+                       $template->param(pageurl => $link);
+                       $template->param(title => pagetitle(basename($page)));
+                       $template->param(content => $content);
+                       $template->param(ctime => displaytime($pagectime{$page}));
+
+                       if ($actions) {
+                               my $file = $pagesources{$page};
+                               my $type = pagetype($file);
+                               if ($config{discussion}) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+                               }
+                               if (length $config{cgiurl} && defined $type) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                               }
+                       }
+
+                       run_hooks(pagetemplate => sub {
+                               shift->(page => $page, destpage => $params{page},
+                                       template => $template,);
+                       });
+
+                       $ret.=$template->output;
+                       $template->clear_params;
+               }
+               else {
+                       my $file=$pagesources{$page};
+                       my $type=pagetype($file);
+                       if (defined $type) {
+                               $ret.="\n".
+                                     linkify($page, $params{page},
+                                     preprocess($page, $params{page},
+                                     filter($page,
+                                     readfile(srcfile($file)))));
+                       }
+               }

        }
        
        # TODO: should really add this to renderedfiles and call
        # check_overwrite, but currently renderedfiles
        # only supports listing one file per page.
        }
        
        # 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} && $rss) {

                writefile(rsspage($params{page}), $config{destdir},
                writefile(rsspage($params{page}), $config{destdir},

-                       genrss($params{page}, @list));
-               $toping{$params{page}}=1;
+                       genrss($desc, $params{page}, @list));
+               $toping{$params{page}}=1 unless $config{rebuild};
+               $rsslinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};

        }
        
        return $ret;
 } #}}}
 
        }
        
        return $ret;
 } #}}}
 

+sub pagetemplate_inline (@) { #{{{
+       my %params=@_;
+       my $page=$params{page};
+       my $template=$params{template};
+
+       $template->param(rsslink => $rsslinks{$page})
+               if exists $rsslinks{$page} && $template->query(name => "rsslink");
+} #}}}
+

 sub get_inline_content ($$) { #{{{
 sub get_inline_content ($$) { #{{{

-       my $parentpage=shift;

        my $page=shift;
        my $page=shift;

+       my $destpage=shift;

        
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);

-       if ($type ne 'unknown') {
-               return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
+       if (defined $type) {
+               return htmlize($page, $type,
+                      linkify($page, $destpage,
+                      preprocess($page, $destpage,
+                      filter($page,
+                      readfile(srcfile($file))))));

        }
        else {
                return "";
        }
        else {
                return "";


@@ -113,7 +188,11 @@ sub date_822 ($) { #{{{
        my $time=shift;
 
        eval q{use POSIX};
        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 ($$) { #{{{
 } #}}}
 
 sub absolute_urls ($$) { #{{{


@@ -134,29 +213,48 @@ sub rsspage ($) { #{{{
        return $page.".rss";
 } #}}}
 
        return $page.".rss";
 } #}}}
 

-sub genrss ($@) { #{{{
+sub genrss ($$@) { #{{{
+       my $desc=shift;

        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        

-       my $url="$config{url}/".htmlpage($page);
+       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));

        
        

-       my $template=template("rsspage.tmpl", blind_cache => 1);
-       
-       my @items;
+       my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
+       my $content="";

        foreach my $p (@pages) {
        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},
        $template->param(
                title => $config{wikiname},

+               wikiname => $config{wikiname},

                pageurl => $url,
                pageurl => $url,

-               items => \@items,
+               content => $content,
+               rssdesc => $desc,

        );
        );

+       run_hooks(pagetemplate => sub {
+               shift->(page => $page, destpage => $page,
+                       template => $template);
+       });

        
        return $template->output;
 } #}}}
        
        return $template->output;
 } #}}}


@@ -184,7 +282,7 @@ sub pingurl (@) { #{{{
                        }
                        my $r=$res->value;
                        if (! exists $r->{flerror} || $r->{flerror}) {
                        }
                        my $r=$res->value;
                        if (! exists $r->{flerror} || $r->{flerror}) {

-                               debug("Ping rejected: ".$r->{message});
+                               debug("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]"));

                        }
                }
        }
                        }
                }
        }