del wrong hook & ikiwiki --post-commit --a-lot-of-switches

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index c3e1f5446f6c98ca9f3c9c65a7a014b7c7e15c59..0e7cbd4d12f0705aa8706461c404a154ad8fbf99 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -3,40 +3,52 @@ package IkiWiki::Plugin::shortcut;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "shortcut", call => \&getsetup);

        hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
        hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
        hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
        hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);

-} #}}}
+}

 
 

-sub checkconfig () { #{{{
-       # Preprocess the shortcuts page to get all the available shortcuts
-       # defined before other pages are rendered.
-       my $srcfile=eval {srcfile("shortcuts.mdwn")};
-       if (! defined $srcfile) {
-               error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub checkconfig () {
+       if (defined $config{srcdir}) {
+               # Preprocess the shortcuts page to get all the available shortcuts
+               # defined before other pages are rendered.
+               my $srcfile=srcfile("shortcuts.mdwn", 1);
+               if (! defined $srcfile) {
+                       error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+               }
+               IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));

        }
        }

-       IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
-} # }}}
+}

 
 

-sub preprocess_shortcut (@) { #{{{
+sub preprocess_shortcut (@) {

        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {
        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {

-               return "[[shortcut ".gettext("missing name or url parameter")."]]";
+               error gettext("missing name or url parameter");

        }
 
        hook(type => "preprocess", no_override => 1, id => $params{name},
        }
 
        hook(type => "preprocess", no_override => 1, id => $params{name},

+               shortcut => 1,

                call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
        #translators: This is used to display what shortcuts are defined.
        #translators: First parameter is the name of the shortcut, the second
        #translators: is an URL.
        return sprintf(gettext("shortcut %s points to <i>%s</i>"), $params{name}, $params{url});
                call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
        #translators: This is used to display what shortcuts are defined.
        #translators: First parameter is the name of the shortcut, the second
        #translators: is an URL.
        return sprintf(gettext("shortcut %s points to <i>%s</i>"), $params{name}, $params{url});

-} # }}}
+}

 
 

-sub shortcut_expand ($$@) { #{{{
+sub shortcut_expand ($$@) {

        my $url=shift;
        my $desc=shift;
        my %params=@_;
        my $url=shift;
        my $desc=shift;
        my %params=@_;


@@ -73,6 +85,6 @@ sub shortcut_expand ($$@) { #{{{
        }
 
        return "<a href=\"$url\">$desc</a>";
        }
 
        return "<a href=\"$url\">$desc</a>";

-} #}}}
+}

 
 1
 
 1