rework dependency types code

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 945892d177d7723bbd0ac579bcd0da36a40fd147..d981670e78d22d5f85a86429cdcda9bc60f78d44 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,39 +4,54 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
 
 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};
        
        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 page is changed, added, or removed,
+       # in order to see the link changes.
+       add_depends($params{page}, $params{pages});

        
        my @orphans;
        
        my @orphans;

-       foreach my $page (keys %IkiWiki::renderedfiles) {
-               next if $linkedto{$page};
-               next unless IkiWiki::globlist_match($page, $params{pages});
+       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.
                # 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$config{discussionpage}\E$/i || ! $config{discussion}) &&
+                       bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
+               } @{$links{$page}};

                push @orphans, $page;
        }
        
                push @orphans, $page;
        }
        

-       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
 
 1