* Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.

[ikiwiki.git] / IkiWiki / Plugin / recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 94a2d4c339a8d4e43695f52bf01cb85be8e1c794..e591df79f66b78e1d63e325e032c4e861f4502db 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -6,30 +6,44 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

-       hook(type => "checkconfig", id => "recentchanges",
-               call => \&checkconfig);
-       hook(type => "needsbuild", id => "recentchanges",
-               call => \&needsbuild);
-       hook(type => "preprocess", id => "recentchanges",
-               call => \&preprocess);
-       hook(type => "htmlize", id => "_change",
-               call => \&htmlize);
+       hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
+       hook(type => "refresh", id => "recentchanges", call => \&refresh);
+       hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
+       hook(type => "htmlize", id => "_change", call => \&htmlize);
+       hook(type => "cgi", id => "recentchanges", call => \&cgi);

 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

-       updatechanges();
+       $config{recentchangespage}='recentchanges' unless defined $config{recentchangespage};
+       $config{recentchangesnum}=100 unless defined $config{recentchangesnum};

 } #}}}
 
 } #}}}
 

-sub needsbuild () { #{{{
-       # TODO
+sub refresh ($) { #{{{
+       my %seen;
+
+       # add new changes
+       foreach my $change (IkiWiki::rcs_recentchanges($config{recentchangesnum})) {
+               $seen{store($change, $config{recentchangespage})}=1;
+       }
+       
+       # delete old and excess changes
+       foreach my $page (keys %pagesources) {
+               if ($page =~ /\._change$/ && ! $seen{$page}) {
+                       unlink($config{srcdir}.'/'.$pagesources{$page});
+               }
+       }

 } #}}}
 
 } #}}}
 

-sub preprocess (@) { #{{{
+# Enable the recentchanges link on wiki pages.
+sub pagetemplate (@) { #{{{

        my %params=@_;
        my %params=@_;

-
-       # TODO
-
-       return "";
+       my $template=$params{template};
+       my $page=$params{page};
+       if ($config{rcs} && $page ne $config{recentchangespage} &&
+           $template->query(name => "recentchangesurl")) {
+               $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
+               $template->param(have_actions => 1);
+       }

 } #}}}
 
 # Pages with extension _change have plain html markup, pass through.
 } #}}}
 
 # Pages with extension _change have plain html markup, pass through.


@@ -38,55 +52,119 @@ sub htmlize (@) { #{{{
        return $params{content};
 } #}}}
 
        return $params{content};
 } #}}}
 

-sub store ($$) { #{{{
+sub cgi ($) { #{{{
+       my $cgi=shift;
+       if (defined $cgi->param('do') && $cgi->param('do') eq "recentchanges_link") {
+               # This is a link from a change page to some
+               # other page. Since the change pages are only generated
+               # once, statically, links on them won't be updated if the
+               # page they link to is deleted, or newly created, or
+               # changes for whatever reason. So this CGI handles that
+               # dynamic linking stuff.
+               my $page=$cgi->param("page");
+               if (!defined $page) {
+                       error("missing page parameter");
+               }
+
+               IkiWiki::loadindex();
+
+               my $link=bestlink("", $page);
+               if (! length $link) {
+                       print "Content-type: text/html\n\n";
+                       print IkiWiki::misctemplate(gettext(gettext("missing page")),
+                               "<p>".
+                               sprintf(gettext("The page %s does not exist."),
+                                       htmllink("", "", $page)).
+                               "</p>");
+               }
+               else {
+                       IkiWiki::redirect($cgi, $config{url}."/".htmlpage($link));
+               }
+
+               exit;
+       }
+}
+
+sub store ($$$) { #{{{

        my $change=shift;
        my $change=shift;

-       my $subdir=shift;
-       
-       my $page="$subdir/change_".IkiWiki::titlepage($change->{rev});
+
+       my $page="$config{recentchangespage}/change_".IkiWiki::titlepage($change->{rev});

 
        # Optimisation to avoid re-writing pages. Assumes commits never
 
        # Optimisation to avoid re-writing pages. Assumes commits never

-       # change, or that any changes are not important.
-       return if exists $pagesources{$page} && ! $config{rebuild};
+       # change (or that any changes are not important).
+       return $page if exists $pagesources{$page} && ! $config{rebuild};

 
        # Limit pages to first 10, and add links to the changed pages.
        my $is_excess = exists $change->{pages}[10];
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
        $change->{pages} = [
                map {
 
        # Limit pages to first 10, and add links to the changed pages.
        my $is_excess = exists $change->{pages}[10];
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
        $change->{pages} = [
                map {

-                       if (length $config{url}) {
-                               $_->{link} = "<a href=\"$config{url}/".
-                                       urlto($_->{page},"")."\">".
-                                       IkiWiki::pagetitle($_->{page})."</a>";
+                       if (length $config{cgiurl}) {
+                               $_->{link} = "<a href=\"".
+                                       IkiWiki::cgiurl(
+                                               do => "recentchanges_link",
+                                               page => $_->{page}
+                                       ).
+                                       "\">".
+                                       IkiWiki::pagetitle($_->{page}).
+                                       "</a>"

                        }
                        else {
                                $_->{link} = IkiWiki::pagetitle($_->{page});
                        }
                        }
                        else {
                                $_->{link} = IkiWiki::pagetitle($_->{page});
                        }

+                       $_->{baseurl}="$config{url}/" if length $config{url};
+

                        $_;
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
 
                        $_;
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
 

+       # See if the committer is an openid.
+       $change->{author}=$change->{user};
+       my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
+       if (defined $oiduser) {
+               $change->{authorurl}=$change->{user};
+               $change->{user}=$oiduser;
+       }
+       elsif (length $config{cgiurl}) {
+               $change->{authorurl} = IkiWiki::cgiurl(
+                       do => "recentchanges_link",
+                       page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+               );
+       }
+
+       # escape wikilinks and preprocessor stuff in commit messages
+       if (ref $change->{message}) {
+               foreach my $field (@{$change->{message}}) {
+                       if (exists $field->{line}) {
+                               $field->{line} =~ s/(?<!\\)\[\[/\\\[\[/g;
+                       }
+               }
+       }
+

        # Fill out a template with the change info.
        # Fill out a template with the change info.

-       $change->{user} = IkiWiki::userlink($change->{user});
-       my $ctime=$change->{when};
-       $change->{when} = IkiWiki::displaytime($change->{when}, "%X %x");

        my $template=template("change.tmpl", blind_cache => 1);
        my $template=template("change.tmpl", blind_cache => 1);

-       $template->param(%$change);
-       $template->param(baseurl => "$config{url}/") if length $config{url};
+       $template->param(
+               %$change,
+               commitdate => displaytime($change->{when}, "%X %x"),
+               wikiname => $config{wikiname},
+       );

        IkiWiki::run_hooks(pagetemplate => sub {
        IkiWiki::run_hooks(pagetemplate => sub {

-               shift->(page => $page, destpage => $page, template => $template);
+               shift->(page => $page, destpage => $page,
+                       template => $template, rev => $change->{rev});

        });
 
        });
 

-       writefile($page."._change", $config{srcdir}, $template->output);
-       utime $ctime, $ctime, "$config{srcdir}/$page._change";
+       my $file=$page."._change";
+       writefile($file, $config{srcdir}, $template->output);
+       utime $change->{when}, $change->{when}, "$config{srcdir}/$file";
+
+       return $page;

 } #}}}
 
 } #}}}
 

-sub updatechanges () { #{{{
-       my @changelog=IkiWiki::rcs_recentchanges(100);
-       foreach my $change (@changelog) {
-               store($change, "recentchanges");
-       }
-       # TODO: delete old
+sub updatechanges ($$) { #{{{
+       my $subdir=shift;
+       my @changes=@{shift()};
+       

 } #}}}
 
 1
 } #}}}
 
 1