Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 0295a8fe6b570d7b49503ba6587ae41a28f0cfa7..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 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);
        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};
        


@@ -18,33 +27,27 @@ sub preprocess (@) { #{{{
        # register a dependency.
        add_depends($params{page}, $params{pages});
        
        # register a dependency.
        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");
-                       my %seen;
-                       foreach my $link (@{$links{$page}}) {
-                               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;
-                               push @{$broken{$link}}, $page;
-                       }
+       my @broken;
+       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 @broken;
-       foreach my $link (keys %broken) {
-               my $page=$broken{$link}->[0];
+               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)
                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}}));
+                       } @pages)
+               );

        }
        
        }
        

-       return gettext("There are no broken links!") unless %broken;
+       return gettext("There are no broken links!") unless @broken;

        return "<ul>\n"
                .join("\n",
                        map {
        return "<ul>\n"
                .join("\n",
                        map {


@@ -52,6 +55,6 @@ sub preprocess (@) { #{{{
                        }
                        sort @broken)
                ."</ul>\n";
                        }
                        sort @broken)
                ."</ul>\n";

-} # }}}
+}

 
 1
 
 1