X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/99292550fdf3c5bf9feb4a665e2de99f5cfc0d35..9a61f3050a0b0df45671237e6451a5fe8295072b:/IkiWiki/Plugin/orphans.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 06b51bddc..944eba541 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -4,37 +4,61 @@ package IkiWiki::Plugin::orphans; use warnings; use strict; +use IkiWiki 3.00; -sub import { #{{{ - IkiWiki::register_plugin("preprocess", "orphans", \&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}); + 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}}; + foreach my $p (keys %links) { + map { $linkedto{bestlink($p, $_)}=1 if length $_ } + @{$links{$p}}; } my @orphans; - foreach my $page (keys %IkiWiki::renderedfiles) { - next if $linkedto{$page}; - next unless IkiWiki::globlist_match($page, $params{pages}); + my $discussion=lc(gettext("Discussion")); + foreach my $page (pagespec_match_list( + [ grep { ! $linkedto{$_} && $_ ne 'index' } + keys %pagesources ], + $params{pages}, location => $params{page})) { # 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::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}}; + next if grep { + length $_ && + ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) && + bestlink($page, $_) !~ /^(\Q$page\E|)$/ + } @{$links{$page}}; push @orphans, $page; } - return "All pages are linked to by other pages." unless @orphans; - return "\n"; -} # }}} + return gettext("All pages are linked to by other pages.") unless @orphans; + return "\n"; +} 1