]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/orphans.pm
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[git.ikiwiki.info.git] / IkiWiki / Plugin / orphans.pm
index ae330b23b81e78abf227cbcb0a5cb757088e485a..702943f87d1cb96927270a2b609de192a7488aa7 100644 (file)
@@ -26,25 +26,31 @@ sub preprocess (@) {
        # 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}, "*", links => 1);
-       # Also needs to update whenever potential orphans are added or
-       # removed.
-       add_depends($params{page}, $params{pages}, presence => 1);
+       add_depends($params{page}, "*", deptype("links"));
        
-       my @orphans;
-       foreach my $page (pagespec_match_list(
-                       [ grep { ! IkiWiki::backlink_pages($_) && $_ 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 $_ &&
-                       ($_ !~ /\/\Q$config{discussionpage}\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 have other pages linking to them.") unless @orphans;
        return "<ul>\n".