po: remove debug statements

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c7bd1875a2b1a6f6fb4161b84485c5a2235eaa23..97dd036f6f4ca2816b6a2beee0f8aeefbbc0d405 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 my %feeds;
 my %guids;
 
 my %feeds;
 my %guids;
 

-sub import { #{{{
+sub import {

        hook(type => "getopt", id => "aggregate", call => \&getopt);
        hook(type => "getsetup", id => "aggregate", call => \&getsetup);
        hook(type => "checkconfig", id => "aggregate", call => \&checkconfig);
        hook(type => "getopt", id => "aggregate", call => \&getopt);
        hook(type => "getsetup", id => "aggregate", call => \&getsetup);
        hook(type => "checkconfig", id => "aggregate", call => \&checkconfig);


@@ -26,9 +26,9 @@ sub import { #{{{
        if (exists $config{aggregate_webtrigger} && $config{aggregate_webtrigger}) {
                hook(type => "cgi", id => "aggregate", call => \&cgi);
        }
        if (exists $config{aggregate_webtrigger} && $config{aggregate_webtrigger}) {
                hook(type => "cgi", id => "aggregate", call => \&cgi);
        }

-} # }}}
+}

 
 

-sub getopt () { #{{{
+sub getopt () {

         eval q{use Getopt::Long};
        error($@) if $@;
         Getopt::Long::Configure('pass_through');
         eval q{use Getopt::Long};
        error($@) if $@;
         Getopt::Long::Configure('pass_through');


@@ -36,9 +36,9 @@ sub getopt () { #{{{
                "aggregate" => \$config{aggregate},
                "aggregateinternal!" => \$config{aggregateinternal},
        );
                "aggregate" => \$config{aggregate},
                "aggregateinternal!" => \$config{aggregateinternal},
        );

-} #}}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
        return
                plugin => {
                        safe => 1,


@@ -58,16 +58,16 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 0,
                },
                        safe => 1,
                        rebuild => 0,
                },

-} #}}}
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        if ($config{aggregate} && ! ($config{post_commit} && 
                                     IkiWiki::commit_hook_enabled())) {
                launchaggregation();
        }
        if ($config{aggregate} && ! ($config{post_commit} && 
                                     IkiWiki::commit_hook_enabled())) {
                launchaggregation();
        }

-} #}}}
+}

 
 

-sub cgi ($) { #{{{
+sub cgi ($) {

        my $cgi=shift;
 
        if (defined $cgi->param('do') &&
        my $cgi=shift;
 
        if (defined $cgi->param('do') &&


@@ -90,9 +90,9 @@ sub cgi ($) { #{{{
                }
                exit 0;
        }
                }
                exit 0;
        }

-} #}}}
+}

 
 

-sub launchaggregation () { #{{{
+sub launchaggregation () {

        # See if any feeds need aggregation.
        loadstate();
        my @feeds=needsaggregate();
        # See if any feeds need aggregation.
        loadstate();
        my @feeds=needsaggregate();


@@ -135,16 +135,16 @@ sub launchaggregation () { #{{{
        unlockaggregate();
 
        return 1;
        unlockaggregate();
 
        return 1;

-} #}}}
+}

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

-sub htmlize (@) { #{{{
+sub htmlize (@) {

        my %params=@_;
        return $params{content};
        my %params=@_;
        return $params{content};

-} #}}}
+}

 
 # Used by ikiwiki-transition aggregateinternal.
 
 # Used by ikiwiki-transition aggregateinternal.

-sub migrate_to_internal { #{{{
+sub migrate_to_internal {

        if (! lockaggregate()) {
                error("an aggregation process is currently running");
        }
        if (! lockaggregate()) {
                error("an aggregation process is currently running");
        }


@@ -158,11 +158,11 @@ sub migrate_to_internal { #{{{
                next if $data->{expired};
                
                $config{aggregateinternal} = 0;
                next if $data->{expired};
                
                $config{aggregateinternal} = 0;

-               my $oldname = pagefile($data->{page});
+               my $oldname = "$config{srcdir}/".htmlfn($data->{page});

                my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page});
                
                $config{aggregateinternal} = 1;
                my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page});
                
                $config{aggregateinternal} = 1;

-               my $newname = pagefile($data->{page});
+               my $newname = "$config{srcdir}/".htmlfn($data->{page});

                
                debug "moving $oldname -> $newname";
                if (-e $newname) {
                
                debug "moving $oldname -> $newname";
                if (-e $newname) {


@@ -190,9 +190,9 @@ sub migrate_to_internal { #{{{
        IkiWiki::unlockwiki;
        
        unlockaggregate();
        IkiWiki::unlockwiki;
        
        unlockaggregate();

-} #}}}
+}

 
 

-sub needsbuild (@) { #{{{
+sub needsbuild (@) {

        my $needsbuild=shift;
        
        loadstate();
        my $needsbuild=shift;
        
        loadstate();


@@ -206,9 +206,9 @@ sub needsbuild (@) { #{{{
                        markunseen($feed->{sourcepage});
                }
        }
                        markunseen($feed->{sourcepage});
                }
        }

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my %params=@_;
 
        foreach my $required (qw{name url}) {
        my %params=@_;
 
        foreach my $required (qw{name url}) {


@@ -245,6 +245,7 @@ sub preprocess (@) { #{{{
        $feed->{template}=$params{template} . ".tmpl";
        delete $feed->{unseen};
        $feed->{lastupdate}=0 unless defined $feed->{lastupdate};
        $feed->{template}=$params{template} . ".tmpl";
        delete $feed->{unseen};
        $feed->{lastupdate}=0 unless defined $feed->{lastupdate};

+       $feed->{lasttry}=$feed->{lastupdate} unless defined $feed->{lasttry};

        $feed->{numposts}=0 unless defined $feed->{numposts};
        $feed->{newposts}=0 unless defined $feed->{newposts};
        $feed->{message}=gettext("new feed") unless defined $feed->{message};
        $feed->{numposts}=0 unless defined $feed->{numposts};
        $feed->{newposts}=0 unless defined $feed->{newposts};
        $feed->{message}=gettext("new feed") unless defined $feed->{message};


@@ -265,9 +266,9 @@ sub preprocess (@) { #{{{
               ($feed->{newposts} ? "; ".$feed->{newposts}.
                                    " ".gettext("new") : "").
               ")";
               ($feed->{newposts} ? "; ".$feed->{newposts}.
                                    " ".gettext("new") : "").
               ")";

-} # }}}
+}

 
 

-sub delete (@) { #{{{
+sub delete (@) {

        my @files=@_;
 
        # Remove feed data for removed pages.
        my @files=@_;
 
        # Remove feed data for removed pages.


@@ -275,9 +276,9 @@ sub delete (@) { #{{{
                my $page=pagename($file);
                markunseen($page);
        }
                my $page=pagename($file);
                markunseen($page);
        }

-} #}}}
+}

 
 

-sub markunseen ($) { #{{{
+sub markunseen ($) {

        my $page=shift;
 
        foreach my $id (keys %feeds) {
        my $page=shift;
 
        foreach my $id (keys %feeds) {


@@ -285,11 +286,11 @@ sub markunseen ($) { #{{{
                        $feeds{$id}->{unseen}=1;
                }
        }
                        $feeds{$id}->{unseen}=1;
                }
        }

-} #}}}
+}

 
 my $state_loaded=0;
 
 
 my $state_loaded=0;
 

-sub loadstate () { #{{{
+sub loadstate () {

        return if $state_loaded;
        $state_loaded=1;
        if (-e "$config{wikistatedir}/aggregate") {
        return if $state_loaded;
        $state_loaded=1;
        if (-e "$config{wikistatedir}/aggregate") {


@@ -323,9 +324,9 @@ sub loadstate () { #{{{
 
                close IN;
        }
 
                close IN;
        }

-} #}}}
+}

 
 

-sub savestate () { #{{{
+sub savestate () {

        return unless $state_loaded;
        garbage_collect();
        my $newfile="$config{wikistatedir}/aggregate.new";
        return unless $state_loaded;
        garbage_collect();
        my $newfile="$config{wikistatedir}/aggregate.new";


@@ -342,7 +343,8 @@ sub savestate () { #{{{
                                push @line, "tag=$_" foreach @{$data->{tags}};
                        }
                        else {
                                push @line, "tag=$_" foreach @{$data->{tags}};
                        }
                        else {

-                               push @line, "$field=".$data->{$field};
+                               push @line, "$field=".$data->{$field}
+                                       if defined $data->{$field};

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


@@ -350,9 +352,9 @@ sub savestate () { #{{{
        close OUT || error("save $newfile: $!", $cleanup);
        rename($newfile, "$config{wikistatedir}/aggregate") ||
                error("rename $newfile: $!", $cleanup);
        close OUT || error("save $newfile: $!", $cleanup);
        rename($newfile, "$config{wikistatedir}/aggregate") ||
                error("rename $newfile: $!", $cleanup);

-} #}}}
+}

 
 

-sub garbage_collect () { #{{{
+sub garbage_collect () {

        foreach my $name (keys %feeds) {
                # remove any feeds that were not seen while building the pages
                # that used to contain them
        foreach my $name (keys %feeds) {
                # remove any feeds that were not seen while building the pages
                # that used to contain them


@@ -364,20 +366,20 @@ sub garbage_collect () { #{{{
        foreach my $guid (values %guids) {
                # any guid whose feed is gone should be removed
                if (! exists $feeds{$guid->{feed}}) {
        foreach my $guid (values %guids) {
                # any guid whose feed is gone should be removed
                if (! exists $feeds{$guid->{feed}}) {

-                       unlink pagefile($guid->{page})
+                       unlink "$config{srcdir}/".htmlfn($guid->{page})

                                if exists $guid->{page};
                        delete $guids{$guid->{guid}};
                }
                # handle expired guids
                elsif ($guid->{expired} && exists $guid->{page}) {
                                if exists $guid->{page};
                        delete $guids{$guid->{guid}};
                }
                # handle expired guids
                elsif ($guid->{expired} && exists $guid->{page}) {

-                       unlink pagefile($guid->{page});
+                       unlink "$config{srcdir}/".htmlfn($guid->{page});

                        delete $guid->{page};
                        delete $guid->{md5};
                }
        }
                        delete $guid->{page};
                        delete $guid->{md5};
                }
        }

-} #}}}
+}

 
 

-sub mergestate () { #{{{
+sub mergestate () {

        # Load the current state in from disk, and merge into it
        # values from the state in memory that might have changed
        # during aggregation.
        # Load the current state in from disk, and merge into it
        # values from the state in memory that might have changed
        # during aggregation.


@@ -390,8 +392,8 @@ sub mergestate () { #{{{
        # fields.
        foreach my $name (keys %myfeeds) {
                if (exists $feeds{$name}) {
        # fields.
        foreach my $name (keys %myfeeds) {
                if (exists $feeds{$name}) {

-                       foreach my $field (qw{message lastupdate numposts
-                                             newposts error}) {
+                       foreach my $field (qw{message lastupdate lasttry
+                                             numposts newposts error}) {

                                $feeds{$name}->{$field}=$myfeeds{$name}->{$field};
                        }
                }
                                $feeds{$name}->{$field}=$myfeeds{$name}->{$field};
                        }
                }


@@ -407,15 +409,15 @@ sub mergestate () { #{{{
                        $guids{$guid}=$myguids{$guid};
                }
        }
                        $guids{$guid}=$myguids{$guid};
                }
        }

-} #}}}
+}

 
 

-sub clearstate () { #{{{
+sub clearstate () {

        %feeds=();
        %guids=();
        $state_loaded=0;
        %feeds=();
        %guids=();
        $state_loaded=0;

-} #}}}
+}

 
 

-sub expire () { #{{{
+sub expire () {

        foreach my $feed (values %feeds) {
                next unless $feed->{expireage} || $feed->{expirecount};
                my $count=0;
        foreach my $feed (values %feeds) {
                next unless $feed->{expireage} || $feed->{expirecount};
                my $count=0;


@@ -444,24 +446,24 @@ sub expire () { #{{{
                        }
                }
        }
                        }
                }
        }

-} #}}}
+}

 
 

-sub needsaggregate () { #{{{
+sub needsaggregate () {

        return values %feeds if $config{rebuild};
        return grep { time - $_->{lastupdate} >= $_->{updateinterval} } values %feeds;
        return values %feeds if $config{rebuild};
        return grep { time - $_->{lastupdate} >= $_->{updateinterval} } values %feeds;

-} #}}}
+}

 
 

-sub aggregate (@) { #{{{
+sub aggregate (@) {

        eval q{use XML::Feed};
        error($@) if $@;
        eval q{use URI::Fetch};
        error($@) if $@;
 
        foreach my $feed (@_) {
        eval q{use XML::Feed};
        error($@) if $@;
        eval q{use URI::Fetch};
        error($@) if $@;
 
        foreach my $feed (@_) {

-               $feed->{lastupdate}=time;
+               $feed->{lasttry}=time;

                $feed->{newposts}=0;
                $feed->{newposts}=0;

-               $feed->{message}=sprintf(gettext("processed ok at %s"),
-                       displaytime($feed->{lastupdate}));
+               $feed->{message}=sprintf(gettext("last checked %s"),
+                       displaytime($feed->{lasttry}));

                $feed->{error}=0;
 
                debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
                $feed->{error}=0;
 
                debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));


@@ -483,6 +485,10 @@ sub aggregate (@) { #{{{
                        debug($feed->{message});
                        next;
                }
                        debug($feed->{message});
                        next;
                }

+
+               # lastupdate is only set if we were able to contact the server
+               $feed->{lastupdate}=$feed->{lasttry};
+

                if ($res->status == URI::Fetch::URI_GONE()) {
                        $feed->{message}=gettext("feed not found");
                        $feed->{error}=1;
                if ($res->status == URI::Fetch::URI_GONE()) {
                        $feed->{message}=gettext("feed not found");
                        $feed->{error}=1;


@@ -496,15 +502,19 @@ sub aggregate (@) { #{{{
                        # that contains invalid UTF-8 sequences. Convert
                        # feed to ascii to try to work around.
                        $feed->{message}.=" ".sprintf(gettext("(invalid UTF-8 stripped from feed)"));
                        # that contains invalid UTF-8 sequences. Convert
                        # feed to ascii to try to work around.
                        $feed->{message}.=" ".sprintf(gettext("(invalid UTF-8 stripped from feed)"));

-                       $content=Encode::decode_utf8($content, 0);
-                       $f=eval{XML::Feed->parse(\$content)};
+                       $f=eval {
+                               $content=Encode::decode_utf8($content, 0);
+                               XML::Feed->parse(\$content)
+                       };

                }
                if ($@) {
                        # Another possibility is badly escaped entities.
                        $feed->{message}.=" ".sprintf(gettext("(feed entities escaped)"));
                        $content=~s/\&(?!amp)(\w+);/&$1;/g;
                }
                if ($@) {
                        # Another possibility is badly escaped entities.
                        $feed->{message}.=" ".sprintf(gettext("(feed entities escaped)"));
                        $content=~s/\&(?!amp)(\w+);/&$1;/g;

-                       $content=Encode::decode_utf8($content, 0);
-                       $f=eval{XML::Feed->parse(\$content)};
+                       $f=eval {
+                               $content=Encode::decode_utf8($content, 0);
+                               XML::Feed->parse(\$content)
+                       };

                }
                if ($@) {
                        $feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";
                }
                if ($@) {
                        $feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";


@@ -520,10 +530,10 @@ sub aggregate (@) { #{{{
                }
 
                foreach my $entry ($f->entries) {
                }
 
                foreach my $entry ($f->entries) {

-                       my $content=$content=$entry->content->body;
+                       my $c=$entry->content;

                        # atom feeds may have no content, only a summary
                        # atom feeds may have no content, only a summary

-                       if (! defined $content && ref $entry->summary) {
-                               $content=$entry->summary->body;
+                       if (! defined $c && ref $entry->summary) {
+                               $c=$entry->summary;

                        }
 
                        add_page(
                        }
 
                        add_page(


@@ -531,15 +541,16 @@ sub aggregate (@) { #{{{
                                copyright => $f->copyright,
                                title => defined $entry->title ? decode_entities($entry->title) : "untitled",
                                link => $entry->link,
                                copyright => $f->copyright,
                                title => defined $entry->title ? decode_entities($entry->title) : "untitled",
                                link => $entry->link,

-                               content => defined $content ? $content : "",
+                               content => (defined $c && defined $c->body) ? $c->body : "",

                                guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
                                ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
                                guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
                                ctime => $entry->issued ? ($entry->issued->epoch || time) : time,

+                               base => (defined $c && $c->can("base")) ? $c->base : undef,

                        );
                }
        }
                        );
                }
        }

-} #}}}
+}

 
 

-sub add_page (@) { #{{{
+sub add_page (@) {

        my %params=@_;
        
        my $feed=$params{feed};
        my %params=@_;
        
        my $feed=$params{feed};


@@ -570,7 +581,7 @@ sub add_page (@) { #{{{
                }
                my $c="";
                while (exists $IkiWiki::pagecase{lc $page.$c} ||
                }
                my $c="";
                while (exists $IkiWiki::pagecase{lc $page.$c} ||

-                      -e pagefile($page.$c)) {
+                      -e "$config{srcdir}/".htmlfn($page.$c)) {

                        $c++
                }
 
                        $c++
                }
 


@@ -581,7 +592,7 @@ sub add_page (@) { #{{{
                        $c="";
                        $page=$feed->{dir}."/item";
                        while (exists $IkiWiki::pagecase{lc $page.$c} ||
                        $c="";
                        $page=$feed->{dir}."/item";
                        while (exists $IkiWiki::pagecase{lc $page.$c} ||

-                              -e pagefile($page.$c)) {
+                              -e "$config{srcdir}/".htmlfn($page.$c)) {

                                $c++
                        }
                }
                                $c++
                        }
                }


@@ -605,7 +616,8 @@ sub add_page (@) { #{{{
        my $template=template($feed->{template}, blind_cache => 1);
        $template->param(title => $params{title})
                if defined $params{title} && length($params{title});
        my $template=template($feed->{template}, blind_cache => 1);
        $template->param(title => $params{title})
                if defined $params{title} && length($params{title});

-       $template->param(content => htmlescape(htmlabs($params{content}, $feed->{feedurl})));
+       $template->param(content => wikiescape(htmlabs($params{content},
+               defined $params{base} ? $params{base} : $feed->{feedurl})));

        $template->param(name => $feed->{name});
        $template->param(url => $feed->{url});
        $template->param(copyright => $params{copyright})
        $template->param(name => $feed->{name});
        $template->param(url => $feed->{url});
        $template->param(copyright => $params{copyright})


@@ -621,27 +633,29 @@ sub add_page (@) { #{{{
        if (defined $mtime && $mtime <= time) {
                # Set the mtime, this lets the build process get the right
                # creation time on record for the new page.
        if (defined $mtime && $mtime <= time) {
                # Set the mtime, this lets the build process get the right
                # creation time on record for the new page.

-               utime $mtime, $mtime, pagefile($guid->{page});
+               utime $mtime, $mtime, "$config{srcdir}/".htmlfn($guid->{page});

                # Store it in pagectime for expiry code to use also.
                $IkiWiki::pagectime{$guid->{page}}=$mtime;
        }
                # Store it in pagectime for expiry code to use also.
                $IkiWiki::pagectime{$guid->{page}}=$mtime;
        }

-} #}}}
+       else {
+               # Dummy value for expiry code.
+               $IkiWiki::pagectime{$guid->{page}}=time;
+       }
+}

 
 

-sub htmlescape ($) { #{{{
+sub wikiescape ($) {

        # escape accidental wikilinks and preprocessor stuff
        # escape accidental wikilinks and preprocessor stuff

-       my $html=shift;
-       $html=~s/(?<!\\)\[\[/\\\[\[/g;
-       return $html;
-} #}}}
+       return encode_entities(shift, '\[\]');
+}

 
 

-sub urlabs ($$) { #{{{
+sub urlabs ($$) {

        my $url=shift;
        my $urlbase=shift;
 
        URI->new_abs($url, $urlbase)->as_string;
        my $url=shift;
        my $urlbase=shift;
 
        URI->new_abs($url, $urlbase)->as_string;

-} #}}}
+}

 
 

-sub htmlabs ($$) { #{{{
+sub htmlabs ($$) {

        # Convert links in html from relative to absolute.
        # Note that this is a heuristic, which is not specified by the rss
        # spec and may not be right for all feeds. Also, see Debian
        # Convert links in html from relative to absolute.
        # Note that this is a heuristic, which is not specified by the rss
        # spec and may not be right for all feeds. Also, see Debian


@@ -677,21 +691,15 @@ sub htmlabs ($$) { #{{{
        $p->eof;
 
        return $ret;
        $p->eof;
 
        return $ret;

-} #}}}
-
-sub pagefile ($) { #{{{
-       my $page=shift;
-
-       return "$config{srcdir}/".htmlfn($page);
-} #}}}
+}

 
 

-sub htmlfn ($) { #{{{
+sub htmlfn ($) {

        return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
        return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});

-} #}}}
+}

 
 my $aggregatelock;
 
 
 my $aggregatelock;
 

-sub lockaggregate () { #{{{
+sub lockaggregate () {

        # Take an exclusive lock to prevent multiple concurrent aggregators.
        # Returns true if the lock was aquired.
        if (! -d $config{wikistatedir}) {
        # Take an exclusive lock to prevent multiple concurrent aggregators.
        # Returns true if the lock was aquired.
        if (! -d $config{wikistatedir}) {


@@ -704,11 +712,11 @@ sub lockaggregate () { #{{{
                return 0;
        }
        return 1;
                return 0;
        }
        return 1;

-} #}}}
+}

 
 

-sub unlockaggregate () { #{{{
+sub unlockaggregate () {

        return close($aggregatelock) if $aggregatelock;
        return;
        return close($aggregatelock) if $aggregatelock;
        return;

-} #}}}
+}

 
 1
 
 1