increase plugin interface to 1.02

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 2a3f36fcebd07be205075b81e57c49737ce35d74..a6f8502368bd911558fceaf513d9d020fd0a365d 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -58,7 +58,7 @@ sub preprocess (@) { #{{{
 
        foreach my $required (qw{name url}) {
                if (! exists $params{$required}) {
-                       return "[[aggregate plugin missing $required parameter]]";
+                       return "[[".sprintf(gettext("aggregate plugin missing %s parameter"), $required)."]]";
                }
        }
 
@@ -86,7 +86,7 @@ sub preprocess (@) { #{{{
        $feed->{lastupdate}=0 unless defined $feed->{lastupdate};
        $feed->{numposts}=0 unless defined $feed->{numposts};
        $feed->{newposts}=0 unless defined $feed->{newposts};
-       $feed->{message}="new feed" unless defined $feed->{message};
+       $feed->{message}=gettext("new feed") unless defined $feed->{message};
        $feed->{error}=0 unless defined $feed->{error};
        $feed->{tags}=[];
        while (@_) {
@@ -100,8 +100,9 @@ sub preprocess (@) { #{{{
        return "<a href=\"".$feed->{url}."\">".$feed->{name}."</a>: ".
               ($feed->{error} ? "<em>" : "").$feed->{message}.
               ($feed->{error} ? "</em>" : "").
-              " (".$feed->{numposts}." posts".
-              ($feed->{newposts} ? "; ".$feed->{newposts}." new" : "").
+              " (".$feed->{numposts}." ".gettext("posts").
+              ($feed->{newposts} ? "; ".$feed->{newposts}.
+                                   " ".gettext("new") : "").
               ")";
 } # }}}
 
@@ -152,8 +153,11 @@ sub loadstate () { #{{{
 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}) {
@@ -187,9 +191,11 @@ sub savestate () { #{{{
                                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 () { #{{{
@@ -202,13 +208,14 @@ sub expire () { #{{{
                        if ($feed->{expireage}) {
                                my $days_old = (time - $IkiWiki::pagectime{$item->{page}}) / 60 / 60 / 24;
                                if ($days_old > $feed->{expireage}) {
-                                       debug("expiring ".$item->{page}." ($days_old days old)");
+                                       debug(sprintf(gettext("expiring %s (%s days old)"),
+                                               $item->{page}, $days_old));
                                        $item->{expired}=1;
                                }
                        }
                        elsif ($feed->{expirecount} &&
                               $count >= $feed->{expirecount}) {
-                               debug("expiring ".$item->{page});
+                               debug(sprintf(gettext("expiring %s"), $item->{page}));
                                $item->{expired}=1;
                        }
                        else {
@@ -231,12 +238,12 @@ sub aggregate () { #{{{
                $feed->{newposts}=0;
                $IkiWiki::forcerebuild{$feed->{sourcepage}}=1;
 
-               debug("checking feed ".$feed->{name}." ...");
+               debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
 
                if (! length $feed->{feedurl}) {
                        my @urls=XML::Feed->find_feeds($feed->{url});
                        if (! @urls) {
-                               $feed->{message}="could not find feed at ".$feed->{feedurl};
+                               $feed->{message}=sprintf(gettext("could not find feed at %s"), $feed->{feedurl});
                                $feed->{error}=1;
                                debug($feed->{message});
                                next;
@@ -245,7 +252,7 @@ sub aggregate () { #{{{
                }
                my $f=eval{XML::Feed->parse(URI->new($feed->{feedurl}))};
                if ($@) {
-                       $feed->{message}="feed crashed XML::Feed! $@";
+                       $feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";
                        $feed->{error}=1;
                        debug($feed->{message});
                        next;
@@ -268,8 +275,8 @@ sub aggregate () { #{{{
                        );
                }
 
-               $feed->{message}="processed ok at ".
-                       displaytime($feed->{lastupdate});
+               $feed->{message}=sprintf(gettext("processed ok at %s"),
+                       displaytime($feed->{lastupdate}));
                $feed->{error}=0;
        }
 } #}}}
@@ -308,8 +315,22 @@ sub add_page (@) { #{{{
                       -e pagefile($page.$c)) {
                        $c++
                }
+
+               # Make sure that the file name isn't too long. 
+               # 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) {
+                       $c="";
+                       $page=$feed->{dir}."/item";
+                       while (exists $IkiWiki::pagecase{lc $page.$c} ||
+                              -e pagefile($page.$c)) {
+                               $c++
+                       }
+               }
+
                $guid->{page}=$page;
-               debug("creating new page $page");
+               debug(sprintf(gettext("creating new page %s"), $page));
        }
        $guid->{feed}=$feed->{name};