web commit by JoshTriplett: [[bugs/wiki_links_still_processed_inside_code_blocks]]

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index d11283f0a4fb113ccb5c444a44f727ab40d83eb3..ae86d79790f7ca2cb57b14448ae1c35880def876 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -31,15 +31,16 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

-       IkiWiki::lockwiki();
+       my $nolock=($config{post_commit} && ! IkiWiki::commit_hook_enabled());
+       IkiWiki::lockwiki() unless $nolock;

        loadstate();
        loadstate();

-       if ($config{aggregate}) {
+       if ($config{aggregate} && ! $nolock) {

                IkiWiki::loadindex();
                aggregate();
                expire();
                savestate();
        }
                IkiWiki::loadindex();
                aggregate();
                expire();
                savestate();
        }

-       IkiWiki::unlockwiki();
+       IkiWiki::unlockwiki() unless $nolock;

 } #}}}
 
 sub filter (@) { #{{{
 } #}}}
 
 sub filter (@) { #{{{


@@ -58,7 +59,7 @@ sub preprocess (@) { #{{{
 
        foreach my $required (qw{name url}) {
                if (! exists $params{$required}) {
 
        foreach my $required (qw{name url}) {
                if (! exists $params{$required}) {

-                       return "[[".sprintf(gettext("aggregate plugin missing %s parameter"), $required)."]]";
+                       return "[[aggregate ".sprintf(gettext("missing %s parameter"), $required)."]]";

                }
        }
 
                }
        }
 


@@ -153,8 +154,11 @@ sub loadstate () { #{{{
 sub savestate () { #{{{
        eval q{use HTML::Entities};
        error($@) if $@;
 sub savestate () { #{{{
        eval q{use HTML::Entities};
        error($@) if $@;

-       open (OUT, ">$config{wikistatedir}/aggregate" ||
-               die "$config{wikistatedir}/aggregate: $!");
+       my $newfile="$config{wikistatedir}/aggregate.new";
+       # TODO: This cleanup function could use improvement. Any newly
+       # aggregated files are left behind unrecorded, and should be deleted.
+       my $cleanup = sub { unlink($newfile) };
+       open (OUT, ">$newfile") || error("open $newfile: $!", $cleanup);

        foreach my $data (values %feeds, values %guids) {
                if ($data->{remove}) {
                        if ($data->{name}) {
        foreach my $data (values %feeds, values %guids) {
                if ($data->{remove}) {
                        if ($data->{name}) {


@@ -188,9 +192,11 @@ sub savestate () { #{{{
                                push @line, "$field=".$data->{$field};
                        }
                }
                                push @line, "$field=".$data->{$field};
                        }
                }

-               print OUT join(" ", @line)."\n";
+               print OUT join(" ", @line)."\n" || error("write $newfile: $!", $cleanup);

        }
        }

-       close OUT;
+       close OUT || error("save $newfile: $!", $cleanup);
+       rename($newfile, "$config{wikistatedir}/aggregate") ||
+               error("rename $newfile: $!", $cleanup);

 } #}}}
 
 sub expire () { #{{{
 } #}}}
 
 sub expire () { #{{{


@@ -238,7 +244,7 @@ sub aggregate () { #{{{
                if (! length $feed->{feedurl}) {
                        my @urls=XML::Feed->find_feeds($feed->{url});
                        if (! @urls) {
                if (! length $feed->{feedurl}) {
                        my @urls=XML::Feed->find_feeds($feed->{url});
                        if (! @urls) {

-                               $feed->{message}=sprintf(gettext("could not find feed at %s"), $feed->{feedurl});
+                               $feed->{message}=sprintf(gettext("could not find feed at %s"), $feed->{url});

                                $feed->{error}=1;
                                debug($feed->{message});
                                next;
                                $feed->{error}=1;
                                debug($feed->{message});
                                next;


@@ -270,7 +276,7 @@ sub aggregate () { #{{{
                        );
                }
 
                        );
                }
 

-               $feed->{message}=sprintf(gettext("processed ok at "),
+               $feed->{message}=sprintf(gettext("processed ok at %s"),

                        displaytime($feed->{lastupdate}));
                $feed->{error}=0;
        }
                        displaytime($feed->{lastupdate}));
                $feed->{error}=0;
        }


@@ -315,9 +321,9 @@ sub add_page (@) { #{{{
                # NB: This doesn't check for path length limits.
                eval q{use POSIX};
                my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX);
                # NB: This doesn't check for path length limits.
                eval q{use POSIX};
                my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX);

-               if (defined $max && length(htmlpage($page)) >= $max) {
+               if (defined $max && length(htmlfn($page)) >= $max) {

                        $c="";
                        $c="";

-                       $page="item";
+                       $page=$feed->{dir}."/item";

                        while (exists $IkiWiki::pagecase{lc $page.$c} ||
                               -e pagefile($page.$c)) {
                                $c++
                        while (exists $IkiWiki::pagecase{lc $page.$c} ||
                               -e pagefile($page.$c)) {
                                $c++


@@ -351,7 +357,7 @@ sub add_page (@) { #{{{
        if (ref $feed->{tags}) {
                $template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
        }
        if (ref $feed->{tags}) {
                $template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
        }

-       writefile(htmlpage($guid->{page}), $config{srcdir},
+       writefile(htmlfn($guid->{page}), $config{srcdir},

                $template->output);
 
        # Set the mtime, this lets the build process get the right creation
                $template->output);
 
        # Set the mtime, this lets the build process get the right creation


@@ -426,7 +432,11 @@ sub remove_feeds () { #{{{
 sub pagefile ($) { #{{{
        my $page=shift;
 
 sub pagefile ($) { #{{{
        my $page=shift;
 

-       return "$config{srcdir}/".htmlpage($page);
+       return "$config{srcdir}/".htmlfn($page);
+} #}}}
+
+sub htmlfn ($) { #{{{
+       return shift().".html";

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