Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 3406f991978d1e707c8f33c46cdd20db419447ab..2318298fe4726c31017c250cf5b57c96b8866640 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,39 +4,53 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "brokenlinks",
-               call => \&preprocess);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "brokenlinks", call => \&getsetup);
+       hook(type => "preprocess", id => "brokenlinks", 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 @broken;
        my @broken;

-       foreach my $page (%IkiWiki::links) {
-               if (IkiWiki::globlist_match($page, $params{pages})) {
-                       foreach my $link (@{$IkiWiki::links{$page}}) {
-                               next if $link =~ /.*\/discussion/i && $IkiWiki::config{discussion};
-                               my $bestlink=IkiWiki::bestlink($page, $link);
-                               next if length $bestlink;
-                               push @broken,
-                                       IkiWiki::htmllink($page, $params{destpage}, $link, 1).
-                                       " in ".
-                                       IkiWiki::htmllink($params{page}, $params{destpage}, $page, 1);
-                       }
-               }
+       foreach my $link (keys %IkiWiki::brokenlinks) {
+               next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
+
+               my @pages=pagespec_match_list($params{page}, $params{pages},
+                       list => $IkiWiki::brokenlinks{$link},
+                       # needs to update when links on a page change
+                       deptype => deptype("links")
+               );
+               next unless @pages;
+
+               my $page=$IkiWiki::brokenlinks{$link}->[0];
+               push @broken, sprintf(gettext("%s from %s"),
+                       htmllink($page, $params{destpage}, $link, noimageinline => 1),
+                       join(", ", map {
+                               htmllink($params{page}, $params{destpage}, $_,  noimageinline => 1)
+                       } sort @pages)
+               );

        }
        
        }
        

-       return "There are no broken links!" unless @broken;
-       my %seen;
-       return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
-} # }}}
+       return gettext("There are no broken links!") unless @broken;
+       return "<ul>\n"
+               .join("\n",
+                       map {
+                               "<li>$_</li>"
+                       }
+                       sort @broken)
+               ."</ul>\n";
+}

 
 1
 
 1