Merge git://git.samba.org/jelmer/ikiwiki

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 6c9848ba356213d27b8886fa716395743654bfa0..5ac0a30ef87ea9848e8fa1dba043984000ec817b 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -6,25 +6,30 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
-       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 => "htmlize", id => "_change", call => \&htmlize);
 } #}}}
 
-sub needsbuild () { #{{{
-       my @changes=IkiWiki::rcs_recentchanges(100);
-       updatechanges("*", "recentchanges", \@changes);
+sub checkconfig () { #{{{
+       $config{recentchangespage}='recentchanges' unless defined $config{recentchangespage};
+       $config{recentchangesnum}=100 unless defined $config{recentchangesnum};
 } #}}}
 
-sub preprocess (@) { #{{{
-       my %params=@_;
-
-       # TODO
+sub refresh ($) { #{{{
+       my %seen;
 
-       return "";
+       # 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=~/^\Q$config{recentchangespage}\E\/change_/ && ! $seen{$page}) {
+                       unlink($config{srcdir}.'/'.$pagesources{$page});
+               }
+       }
 } #}}}
 
 # Pages with extension _change have plain html markup, pass through.
@@ -33,15 +38,14 @@ sub htmlize (@) { #{{{
        return $params{content};
 } #}}}
 
-sub store ($$) { #{{{
+sub store ($$$) { #{{{
        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
        # change (or that any changes are not important).
-       return if exists $pagesources{$page} && ! $config{rebuild};
+       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];
@@ -56,17 +60,15 @@ sub store ($$) { #{{{
                        else {
                                $_->{link} = IkiWiki::pagetitle($_->{page});
                        }
+                       $_->{baseurl}="$config{url}/" if length $config{url};
+
                        $_;
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
 
-       # Take the first line of the commit message as a summary.
-       #my $m=shift @{$change->{message}};
-       #$change->{summary}=$m->{line};
-       #delete $change->{message} unless @{$change->{message}};
-
        # See if the committer is an openid.
+       $change->{author}=$change->{user};
        my $oiduser=IkiWiki::openiduser($change->{user});
        if (defined $oiduser) {
                $change->{authorurl}=$change->{user};
@@ -78,6 +80,15 @@ sub store ($$) { #{{{
                        $change->{user};
        }
 
+       # 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.
        my $template=template("change.tmpl", blind_cache => 1);
        $template->param(
@@ -85,26 +96,21 @@ sub store ($$) { #{{{
                commitdate => displaytime($change->{when}, "%X %x"),
                wikiname => $config{wikiname},
        );
-       $template->param(baseurl => "$config{url}/") if length $config{url};
        IkiWiki::run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page, template => $template);
        });
 
-       my $html=$template->output;
-       # escape  wikilinks and preprocessor stuff
-       $html=~s/(?<!\\)\[\[/\\\[\[/g;
-       writefile($page."._change", $config{srcdir}, $html);
-       utime $change->{when}, $change->{when}, "$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 $pagespec=shift;
        my $subdir=shift;
        my @changes=@{shift()};
-       foreach my $change (@changes) {
-               store($change, $subdir);
-       }
-       # TODO: delete old
+       
 } #}}}
 
 1