Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index ed533109ac113fc5bba4836258ee1bb6bac29cd0..e787424aaee5ca0e01c58f236a87f32c2d493e02 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -3,45 +3,56 @@ package IkiWiki::Plugin::conditional;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 use UNIVERSAL;
 
 use UNIVERSAL;
 

-# Globals used to pass information into the PageSpec functions.
-our ($sourcepage, $destpage);
-

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

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

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

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

 sub preprocess_if (@) { #{{{
        my %params=@_;
 
 sub preprocess_if (@) { #{{{
        my %params=@_;
 

-       if (! exists $params{test} || ! exists $params{then}) {
-               return "[[if ".gettext('"test" and "then" parameters are required')."]]";
+       foreach my $param (qw{test then}) {
+               if (! exists $params{$param}) {
+                       error sprintf(gettext('%s parameter is required'), $param);
+               }

        }
 
        my $result=0;
        }
 
        my $result=0;

-       $sourcepage=$params{page};
-       $destpage=$params{destpage};
-       # An optimisation to avoid needless looping over every page
-       # and adding of dependencies for simple uses of some of the
-       # tests.
-       if ($params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) {
-               $result=eval "IkiWiki::PageSpec::match_$1(undef, ".
-                       IkiWiki::safequote($2).")";
+       if ((exists $params{all} && lc $params{all} eq "no") ||
+               # An optimisation to avoid needless looping over every page
+               # and adding of dependencies for simple uses of some of the
+               # tests.
+               $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
+               add_depends($params{page}, "($params{test}) and $params{page}");
+               $result=pagespec_match($params{page}, $params{test},
+                               location => $params{page},
+                               sourcepage => $params{page},
+                               destpage => $params{destpage});

        }
        else {
                add_depends($params{page}, $params{test});
 
                foreach my $page (keys %pagesources) {
        }
        else {
                add_depends($params{page}, $params{test});
 
                foreach my $page (keys %pagesources) {

-                       if (pagespec_match($page, $params{test}, $params{page})) {
+                       if (pagespec_match($page, $params{test}, 
+                                       location => $params{page},
+                                       sourcepage => $params{page},
+                                       destpage => $params{destpage})) {

                                $result=1;
                                last;
                        }
                }
        }
                                $result=1;
                                last;
                        }
                }
        }

-       $sourcepage="";
-       $destpage="";

 
        my $ret;
        if ($result) {
 
        my $ret;
        if ($result) {


@@ -54,37 +65,64 @@ sub preprocess_if (@) { #{{{
                $ret="";
        }
        return IkiWiki::preprocess($params{page}, $params{destpage}, 
                $ret="";
        }
        return IkiWiki::preprocess($params{page}, $params{destpage}, 

-               IkiWiki::filter($params{page}, $ret));
+               IkiWiki::filter($params{page}, $params{destpage}, $ret));

 } # }}}
 
 package IkiWiki::PageSpec;
 
 } # }}}
 
 package IkiWiki::PageSpec;
 

-sub match_enabled ($$) { #{{{
+sub match_enabled ($$;@) { #{{{

        shift;
        my $plugin=shift;
        
        # test if the plugin is enabled
        shift;
        my $plugin=shift;
        
        # test if the plugin is enabled

-       return UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import");
+       if (UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import")) {
+               return IkiWiki::SuccessReason->new("$plugin is enabled");
+       }
+       else {
+               return IkiWiki::FailReason->new("$plugin is not enabled");
+       }

 } #}}}
 
 } #}}}
 

-sub match_sourcepage ($$) { #{{{
+sub match_sourcepage ($$;@) { #{{{

        shift;
        my $glob=shift;
        shift;
        my $glob=shift;

-       
-       return match_glob($IkiWiki::Plugin::conditional::sourcepage, $glob,
-               $IkiWiki::Plugin::conditional::sourcepage);
+       my %params=@_;
+
+       return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
+       if (match_glob($params{sourcepage}, $glob, @_)) {
+               return IkiWiki::SuccessReason->new("sourcepage matches $glob");
+       }
+       else {
+               return IkiWiki::FailReason->new("sourcepage does not match $glob");
+       }

 } #}}}
 
 } #}}}
 

-sub match_destpage ($$) { #{{{
+sub match_destpage ($$;@) { #{{{

        shift;
        my $glob=shift;
        shift;
        my $glob=shift;

+       my %params=@_;

        
        

-       return match_glob($IkiWiki::Plugin::conditional::destpage, $glob,
-               $IkiWiki::Plugin::conditional::sourcepage);
+       return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
+       if (match_glob($params{destpage}, $glob, @_)) {
+               return IkiWiki::SuccessReason->new("destpage matches $glob");
+       }
+       else {
+               return IkiWiki::FailReason->new("destpage does not match $glob");
+       }

 } #}}}
 
 } #}}}
 

-sub match_included ($$) { #{{{
-       return $IkiWiki::Plugin::conditional::sourcepage ne $IkiWiki::Plugin::conditional::destpage;
+sub match_included ($$;@) { #{{{
+       shift;
+       shift;
+       my %params=@_;
+
+       return IkiWiki::FailReason->new("cannot match included") unless exists $params{sourcepage} && exists $params{destpage};
+       if ($params{sourcepage} ne $params{destpage}) {
+               return IkiWiki::SuccessReason->new("page $params{sourcepage} is included");
+       }
+       else {
+               return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+       }

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