urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more robust and faster handling of feedurls

master
joey 2006-07-30 06:14:44 +00:00
parent 8a5f9f6e00
commit dcaa4b013e
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IkiWiki/Plugin/aggregate.pm
View File

@ -74,7 +74,7 @@ sub preprocess (@) { #{{{
$dir=~s/^\/+//; $dir=~s/^\/+//;
($dir)=$dir=~/$IkiWiki::config{wiki_file_regexp}/; ($dir)=$dir=~/$IkiWiki::config{wiki_file_regexp}/;
$feed->{dir}=$dir; $feed->{dir}=$dir;
$feed->{feedurl}=defined $params{feedurl} ? $params{feedurl} : $params{url}; $feed->{feedurl}=defined $params{feedurl} ? $params{feedurl} : "";
$feed->{updateinterval}=defined $params{updateinterval} ? $params{updateinterval} * 60 : 15 * 60; $feed->{updateinterval}=defined $params{updateinterval} ? $params{updateinterval} * 60 : 15 * 60;
$feed->{expireage}=defined $params{expireage} ? $params{expireage} : 0; $feed->{expireage}=defined $params{expireage} ? $params{expireage} : 0;
$feed->{expirecount}=defined $params{expirecount} ? $params{expirecount} : 0; $feed->{expirecount}=defined $params{expirecount} ? $params{expirecount} : 0;
@ -180,7 +180,7 @@ sub aggregate () { #{{{
eval q{use HTML::Entities}; eval q{use HTML::Entities};
die $@ if $@; die $@ if $@;
FEED: foreach my $feed (values %feeds) { foreach my $feed (values %feeds) {
next unless time - $feed->{lastupdate} >= $feed->{updateinterval}; next unless time - $feed->{lastupdate} >= $feed->{updateinterval};
$feed->{lastupdate}=time; $feed->{lastupdate}=time;
$feed->{newposts}=0; $feed->{newposts}=0;
@ -188,23 +188,25 @@ FEED: foreach my $feed (values %feeds) {
IkiWiki::debug("checking feed ".$feed->{name}." ..."); IkiWiki::debug("checking feed ".$feed->{name}." ...");
my @urls=XML::Feed->find_feeds($feed->{feedurl}); if (! length $feed->{feedurl}) {
my @urls=XML::Feed->find_feeds($feed->{url});
if (! @urls) { if (! @urls) {
$feed->{message}="could not find feed at ".$feed->{feedurl}; $feed->{message}="could not find feed at ".$feed->{feedurl};
IkiWiki::debug($feed->{message}); IkiWiki::debug($feed->{message});
next FEED; next;
} }
foreach my $url (@urls) { $feed->{feedurl}=pop @urls;
my $f=eval{XML::Feed->parse(URI->new($url))}; }
my $f=eval{XML::Feed->parse(URI->new($feed->{feedurl}))};
if ($@) { if ($@) {
$feed->{message}="feed crashed XML::Feed! $@"; $feed->{message}="feed crashed XML::Feed! $@";
IkiWiki::debug($feed->{message}); IkiWiki::debug($feed->{message});
next FEED; next;
} }
if (! $f) { if (! $f) {
$feed->{message}=XML::Feed->errstr; $feed->{message}=XML::Feed->errstr;
IkiWiki::debug($feed->{message}); IkiWiki::debug($feed->{message});
next FEED; next;
} }
foreach my $entry ($f->entries) { foreach my $entry ($f->entries) {
@ -217,7 +219,7 @@ FEED: foreach my $feed (values %feeds) {
ctime => $entry->issued ? ($entry->issued->epoch || time) : time, ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
); );
} }
}
$feed->{message}="processed ok"; $feed->{message}="processed ok";
} }