X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/e49ff966a39d1037ccbf168b8dbd12618cf1b41e..88830016154d99a0155e1cee58582e9f32dcca51:/IkiWiki/Plugin/aggregate.pm
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 5c8151b58..98e534366 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -53,7 +53,7 @@ sub filter (@) { #{{{
sub preprocess (@) { #{{{
my %params=@_;
- foreach my $required (qw{name url dir}) {
+ foreach my $required (qw{name url}) {
if (! exists $params{$required}) {
return "[[aggregate plugin missing $required parameter]]";
}
@@ -70,10 +70,12 @@ sub preprocess (@) { #{{{
$feed->{name}=$name;
$feed->{sourcepage}=$params{page};
$feed->{url}=$params{url};
- ($feed->{dir})=$params{dir}=~/$IkiWiki::config{wiki_file_regexp}/;
- $feed->{dir}=~s/^\/+//;
- $feed->{feedurl}=defined $params{feedurl} ? $params{feedurl} : $params{url};
- $feed->{updateinterval}=defined $params{updateinterval} ? $params{updateinterval} : 15;
+ my $dir=exists $params{dir} ? $params{dir} : "feed/".IkiWiki::titlepage($params{name});
+ $dir=~s/^\/+//;
+ ($dir)=$dir=~/$IkiWiki::config{wiki_file_regexp}/;
+ $feed->{dir}=$dir;
+ $feed->{feedurl}=defined $params{feedurl} ? $params{feedurl} : "";
+ $feed->{updateinterval}=defined $params{updateinterval} ? $params{updateinterval} * 60 : 15 * 60;
$feed->{expireage}=defined $params{expireage} ? $params{expireage} : 0;
$feed->{expirecount}=defined $params{expirecount} ? $params{expirecount} : 0;
delete $feed->{remove};
@@ -81,6 +83,7 @@ sub preprocess (@) { #{{{
$feed->{numposts}=0 unless defined $feed->{numposts};
$feed->{newposts}=0 unless defined $feed->{newposts};
$feed->{message}="new feed" unless defined $feed->{message};
+ $feed->{tags}=[];
while (@_) {
my $key=shift;
my $value=shift;
@@ -91,7 +94,7 @@ sub preprocess (@) { #{{{
return "{url}."\">".$feed->{name}.": ".
"".$feed->{message}." (".$feed->{numposts}.
- " stored posts; ".$feed->{newposts}." new)";
+ " stored posts; ".$feed->{newposts}." new)
";
} # }}}
sub delete (@) { #{{{
@@ -105,6 +108,8 @@ sub delete (@) { #{{{
} #}}}
sub loadstate () { #{{{
+ eval q{use HTML::Entities};
+ die $@ if $@;
if (-e "$IkiWiki::config{wikistatedir}/aggregate") {
open (IN, "$IkiWiki::config{wikistatedir}/aggregate" ||
die "$IkiWiki::config{wikistatedir}/aggregate: $!");
@@ -114,8 +119,9 @@ sub loadstate () { #{{{
my $data={};
foreach my $i (split(/ /, $_)) {
my ($field, $val)=split(/=/, $i, 2);
- if ($field eq "name" || $field eq "message") {
- $data->{$field}=IkiWiki::pagetitle($val);
+ if ($field eq "name" || $field eq "feed" ||
+ $field eq "guid" || $field eq "message") {
+ $data->{$field}=decode_entities($val, " \t\n");
}
elsif ($field eq "tag") {
push @{$data->{tags}}, $val;
@@ -138,6 +144,8 @@ sub loadstate () { #{{{
} #}}}
sub savestate () { #{{{
+ eval q{use HTML::Entities};
+ die $@ if $@;
open (OUT, ">$IkiWiki::config{wikistatedir}/aggregate" ||
die "$IkiWiki::config{wikistatedir}/aggregate: $!");
foreach my $data (values %feeds, values %guids) {
@@ -157,8 +165,9 @@ sub savestate () { #{{{
my @line;
foreach my $field (keys %$data) {
- if ($field eq "name" || $field eq "message") {
- push @line, "$field=".IkiWiki::titlepage($data->{$field});
+ if ($field eq "name" || $field eq "feed" ||
+ $field eq "guid" || $field eq "message") {
+ push @line, "$field=".encode_entities($data->{$field}, " \t\n");
}
elsif ($field eq "tags") {
push @line, "tag=$_" foreach @{$data->{tags}};
@@ -178,38 +187,47 @@ sub aggregate () { #{{{
eval q{use HTML::Entities};
die $@ if $@;
-FEED: foreach my $feed (values %feeds) {
- # TODO: check updateinterval
+ foreach my $feed (values %feeds) {
+ next unless $IkiWiki::config{rebuild} ||
+ time - $feed->{lastupdate} >= $feed->{updateinterval};
$feed->{lastupdate}=time;
$feed->{newposts}=0;
$IkiWiki::forcerebuild{$feed->{sourcepage}}=1;
IkiWiki::debug("checking feed ".$feed->{name}." ...");
- my @urls=XML::Feed->find_feeds($feed->{feedurl});
- if (! @urls) {
- $feed->{message}="could not find feed at ".$feed->{feedurl};
- IkiWiki::debug($feed->{message});
- }
- foreach my $url (@urls) {
- my $f=XML::Feed->parse(URI->new($url));
- if (! $f) {
- $feed->{message}=XML::Feed->errstr;
+ if (! length $feed->{feedurl}) {
+ my @urls=XML::Feed->find_feeds($feed->{url});
+ if (! @urls) {
+ $feed->{message}="could not find feed at ".$feed->{feedurl};
IkiWiki::debug($feed->{message});
- next FEED;
+ next;
}
+ $feed->{feedurl}=pop @urls;
+ }
+ my $f=eval{XML::Feed->parse(URI->new($feed->{feedurl}))};
+ if ($@) {
+ $feed->{message}="feed crashed XML::Feed! $@";
+ IkiWiki::debug($feed->{message});
+ next;
+ }
+ if (! $f) {
+ $feed->{message}=XML::Feed->errstr;
+ IkiWiki::debug($feed->{message});
+ next;
+ }
- foreach my $entry ($f->entries) {
- add_page(
- feed => $feed,
- title => decode_entities($entry->title),
- link => $entry->link,
- content => $entry->content->body,
- guid => defined $entry->id ? $entry->id : time."_".$feed->name,
- ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
- );
- }
+ foreach my $entry ($f->entries) {
+ add_page(
+ feed => $feed,
+ title => defined $entry->title ? decode_entities($entry->title) : "untitled",
+ link => $entry->link,
+ content => $entry->content->body,
+ guid => defined $entry->id ? $entry->id : time."_".$feed->name,
+ ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
+ );
}
+
$feed->{message}="processed ok";
}
@@ -218,7 +236,7 @@ FEED: foreach my $feed (values %feeds) {
sub add_page (@) { #{{{
my %params=@_;
-
+
my $feed=$params{feed};
my $guid={};
my $mtime;
@@ -235,7 +253,10 @@ sub add_page (@) { #{{{
$feed->{newposts}++;
# assign it an unused page
- my $page=$feed->{dir}."/".IkiWiki::titlepage($params{title});
+ my $page=IkiWiki::titlepage($params{title});
+ $page=~s!([/])!"__".ord($1)."__"!eg; # escape slashes in title
+ $page=$feed->{dir}."/".$page;
+ $page=lc($page);
($page)=$page=~/$IkiWiki::config{wiki_file_regexp}/;
if (! defined $page || ! length $page) {
$page=$feed->{dir}."/item";
@@ -255,8 +276,9 @@ sub add_page (@) { #{{{
# to avoid unneccessary rebuilding. The mtime from rss cannot be
# trusted; let's use a digest.
eval q{use Digest::MD5 'md5_hex'};
- my $digest=md5_hex($params{content});
- return unless ! exists $guid->{md5} || $guid->{md5} ne $digest;
+ require Encode;
+ my $digest=md5_hex(Encode::encode_utf8($params{content}));
+ return unless ! exists $guid->{md5} || $guid->{md5} ne $digest || $IkiWiki::config{rebuild};
$guid->{md5}=$digest;
# Create the page.
@@ -264,12 +286,14 @@ sub add_page (@) { #{{{
my $content=$params{content};
$params{content}=~s/(?param(title => $params{title})
+ if defined $params{title} && length($params{title});
$template->param(content => $params{content});
$template->param(url => $feed->{url});
$template->param(name => $feed->{name});
$template->param(link => $params{link}) if defined $params{link};
if (ref $feed->{tags}) {
- $template->param(tags => map { tag => $_ }, @{$feed->{tags}});
+ $template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
}
IkiWiki::writefile($guid->{page}.".html", $IkiWiki::config{srcdir},
$template->output);