X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5fa878cc75447f7a93565843c5a172fed0c3e73d..4af4d26582f0c2b915d7102fb4a604b176385748:/IkiWiki/Plugin/orphans.pm diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 12b9d2e52..702943f87 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -4,43 +4,64 @@ package IkiWiki::Plugin::orphans; use warnings; use strict; -use IkiWiki; +use IkiWiki 3.00; -sub import { #{{{ - IkiWiki::hook(type => "preprocess", id => "orphans", - call => \&preprocess); -} # }}} +sub import { + hook(type => "getsetup", id => "orphans", call => \&getsetup); + hook(type => "preprocess", id => "orphans", call => \&preprocess); +} -sub preprocess (@) { #{{{ +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, +} + +sub preprocess (@) { my %params=@_; $params{pages}="*" unless defined $params{pages}; - # Needs to update whenever a page is added or removed, so - # register a dependency. - IkiWiki::add_depends($params{page}, $params{pages}); - - my %linkedto; - foreach my $p (keys %IkiWiki::links) { - map { $linkedto{IkiWiki::bestlink($p, $_)}=1 if length $_ } - @{$IkiWiki::links{$p}}; - } + # Needs to update whenever a link changes, on any page + # since any page could link to one of the pages we're + # considering as orphans. + add_depends($params{page}, "*", deptype("links")); - my @orphans; - foreach my $page (keys %IkiWiki::renderedfiles) { - next if $linkedto{$page}; - next unless IkiWiki::globlist_match($page, $params{pages}); - # If the page has a link to some other page, it's - # indirectly linked to a page via that page's backlinks. - next if grep { - length $_ && - ($_ !~ /\/Discussion$/i || ! $IkiWiki::config{discussion}) && - IkiWiki::bestlink($page, $_) !~ /^($page|)$/ - } @{$IkiWiki::links{$page}}; - push @orphans, $page; - } + my @orphans=pagespec_match_list($params{page}, $params{pages}, + # update when orphans are added/removed + deptype => deptype("presence"), + filter => sub { + my $page=shift; + + # Filter out pages that other pages link to. + return 1 if IkiWiki::backlink_pages($page); + + # Toplevel index is assumed to never be orphaned. + return 1 if $page eq 'index'; + + # If the page has a link to some other page, it's + # indirectly linked via that page's backlinks. + return 1 if grep { + length $_ && + ($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) && + bestlink($page, $_) !~ /^(\Q$page\E|)$/ + } @{$links{$page}}; + + return 0; + }, + ); - return "All pages are linked to by other pages." unless @orphans; - return "