Merge commit 'remotes/github/debian-unstable' into slop

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index a4da7161e22d8707664b41484839087933893b93..eb698b0bef9f7b2c9df90b342dcfac56c79a1795 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,13 +4,22 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+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};
        
@@ -19,23 +28,33 @@ sub preprocess (@) { #{{{
        add_depends($params{page}, $params{pages});
        
        my @broken;
-       foreach my $page (keys %links) {
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       my $discussion=gettext("discussion");
-                       foreach my $link (@{$links{$page}}) {
-                               next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
-                               my $bestlink=bestlink($page, $link);
-                               next if length $bestlink;
-                               push @broken, sprintf(gettext("%s from %s"),
-                                       htmllink($page, $params{destpage}, $link, noimageinline => 1),
-                                       htmllink($params{page}, $params{destpage}, $page, noimageinline => 1));
-                       }
+       foreach my $link (keys %IkiWiki::brokenlinks) {
+               next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
+
+               my @pages;
+               foreach my $page (@{$IkiWiki::brokenlinks{$link}}) {
+                       push @pages, $page
+                               if pagespec_match($page, $params{pages}, location => $params{page});
                }
+               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)
+                       } @pages)
+               );
        }
        
        return gettext("There are no broken links!") unless @broken;
-       my %seen;
-       return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
-} # }}}
+       return "<ul>\n"
+               .join("\n",
+                       map {
+                               "<li>$_</li>"
+                       }
+                       sort @broken)
+               ."</ul>\n";
+}
 
 1