Merge remote branch 'smcv/ready/sort-package'

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 32cbc5dd5508d3df58945ebef75a80704034c7ad..e3cc3c940882dd27ec7576f8ff8ee63eb8dd845e 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,51 +4,56 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "orphans", call => \&getsetup);
        hook(type => "preprocess", id => "orphans", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return 
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "widget",
                },
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
-       # Needs to update whenever a page is added or removed, so
-       # register a dependency.
-       add_depends($params{page}, $params{pages});
+       # 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 %linkedto;
-       foreach my $p (keys %links) {
-               map { $linkedto{bestlink($p, $_)}=1 if length $_ }
-                       @{$links{$p}};
-       }
-       
-       my @orphans;
-       my $discussion=gettext("discussion");
-       foreach my $page (keys %pagesources) {
-               next if $linkedto{$page} || $page eq 'index';
-               next unless pagespec_match($page, $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 $_ &&
-                       ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
-                       bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
-               } @{$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 gettext("All pages are linked to by other pages.") unless @orphans;
+       return gettext("All pages have other pages linking to them.") unless @orphans;
        return "<ul>\n".
                join("\n",
                        map {
@@ -58,6 +63,6 @@ sub preprocess (@) { #{{{
                                "</li>"
                        } sort @orphans).
                "</ul>\n";
-} # }}}
+}
 
 1