X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/99292550fdf3c5bf9feb4a665e2de99f5cfc0d35..1226d9f144310876080c077a9c45bd2257829a32:/IkiWiki/Plugin/orphans.pm

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 06b51bddc..e3cc3c940 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,37 +4,65 @@ 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,
+			section => "widget",
+		},
+}
+
+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::bestlink($page, $_) ne $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 "<ul>\n".join("\n", map { "<li>".IkiWiki::htmllink($params{page}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
-} # }}}
+	return gettext("All pages have other pages linking to them.") unless @orphans;
+	return "<ul>\n".
+		join("\n",
+			map {
+				"<li>".
+				htmllink($params{page}, $params{destpage}, $_,
+					 noimageinline => 1).
+				"</li>"
+			} sort @orphans).
+		"</ul>\n";
+}
 
 1