Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index e79ce1d810ec09e5591e49357e897c82405249d6..37752dd3ef9e9b4113bfcaa1a9b49bb0a4e06bab 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,12 +4,21 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "brokenlinks", call => \&getsetup);

        hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);
 } # }}}
 
        hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);
 } # }}}
 

+sub getsetup { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};


@@ -18,24 +27,40 @@ sub preprocess (@) { #{{{
        # register a dependency.
        add_depends($params{page}, $params{pages});
        
        # register a dependency.
        add_depends($params{page}, $params{pages});
        

-       my @broken;
+       my %broken;

        foreach my $page (keys %links) {
        foreach my $page (keys %links) {

-               if (pagespec_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
+                       my $discussion=gettext("discussion");
+                       my %seen;

                        foreach my $link (@{$links{$page}}) {
                        foreach my $link (@{$links{$page}}) {

-                               next if $link =~ /.*\/discussion/i && $config{discussion};
+                               next if $seen{$link};
+                               $seen{$link}=1;
+                               next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};

                                my $bestlink=bestlink($page, $link);
                                next if length $bestlink;
                                my $bestlink=bestlink($page, $link);
                                next if length $bestlink;

-                               push @broken,
-                                       htmllink($page, $params{destpage}, $link, 1).
-                                       " from ".
-                                       htmllink($params{page}, $params{destpage}, $page, 1);
+                               push @{$broken{$link}}, $page;

                        }
                }
        }
                        }
                }
        }

+
+       my @broken;
+       foreach my $link (keys %broken) {
+               my $page=$broken{$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)
+                       } @{$broken{$link}}));
+       }

        
        

-       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 gettext("There are no broken links!") unless %broken;
+       return "<ul>\n"
+               .join("\n",
+                       map {
+                               "<li>$_</li>"
+                       }
+                       sort @broken)
+               ."</ul>\n";

 } # }}}
 
 1
 } # }}}
 
 1