optimise url parsing and add guard against failure to parse

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index fe4aee3bbb8393a60941f32bd1092341ec8da230..fc8927ccb6ca4dca305b013077c1bb8a34cb3561 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+       add_underlay("directives");
        hook(type => "getsetup", id => "listdirectives", call => \&getsetup);
        hook(type => "checkconfig", id => "listdirectives", call => \&checkconfig);
        hook(type => "needsbuild", id => "listdirectives", call => \&needsbuild);
@@ -21,8 +22,8 @@ sub getsetup () { #{{{
                },
                directive_description_dir => {
                        type => "string",
-                       description => "directory in srcdir that contains PreprocessorDirective descriptions",
-                       example => "ikiwiki/plugin",
+                       description => "directory in srcdir that contains directive descriptions",
+                       example => "ikiwiki/directive",
                        safe => 1,
                        rebuild => 1,
                },
@@ -34,20 +35,20 @@ my $pluginstring;
 
 sub checkconfig () { #{{{
        if (! defined $config{directive_description_dir}) {
-               $config{directive_description_dir} = "ikiwiki/plugin";
+               $config{directive_description_dir} = "ikiwiki/directive";
        }
        else {
-               $config{directive_description_dir}=~s/\/+$//;
+               $config{directive_description_dir} =~ s/\/+$//;
        }
 
-       @earlylist = sort( keys %{ $IkiWiki::hooks{preprocess} } );
+       @earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
 } #}}}
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 
-       @fulllist = sort( keys %{ $IkiWiki::hooks{preprocess} } );
-       $pluginstring = join (' ', @earlylist) . " : ". join (' ', @fulllist);
+       @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
+       $pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {
@@ -83,8 +84,9 @@ sub preprocess (@) { #{{{
        
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
-               $result .= htmllink($params{page}, $params{destpage},
-                       IkiWiki::linkpage($config{directive_description_dir}."/".$plugin));
+               my $link=linkpage($config{directive_description_dir}."/".$plugin);
+               add_depends($params{page}, $link);
+               $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }