po: added postscan hook, to make pages depend on the pages linking to them

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 6be52eaa6d43b6cc5052a657a0bf907a2d1c78f1..66253e07d9e5aa18d33a4d81db177acf672a8a90 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -6,11 +6,20 @@ use strict;
 use IkiWiki 2.00;
 use UNIVERSAL;
 
 use IkiWiki 2.00;
 use UNIVERSAL;
 

-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 preprocess_if (@) { #{{{
+sub getsetup {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess_if (@) {

        my %params=@_;
 
        foreach my $param (qw{test then}) {
        my %params=@_;
 
        foreach my $param (qw{test then}) {


@@ -24,8 +33,8 @@ sub preprocess_if (@) { #{{{
                # An optimisation to avoid needless looping over every page
                # and adding of dependencies for simple uses of some of the
                # tests.
                # An optimisation to avoid needless looping over every page
                # and adding of dependencies for simple uses of some of the
                # tests.

-               $params{test} =~ /^\s*\!?\s*(enabled|sourcepage|destpage|included)\((.*)\)\s*$/) {
-               add_depends($params{page}, "$params{test} and $params{page}");
+               $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},
                $result=pagespec_match($params{page}, $params{test},
                                location => $params{page},
                                sourcepage => $params{page},


@@ -57,11 +66,11 @@ sub preprocess_if (@) { #{{{
        }
        return IkiWiki::preprocess($params{page}, $params{destpage}, 
                IkiWiki::filter($params{page}, $params{destpage}, $ret));
        }
        return IkiWiki::preprocess($params{page}, $params{destpage}, 
                IkiWiki::filter($params{page}, $params{destpage}, $ret));

-} # }}}
+}

 
 package IkiWiki::PageSpec;
 
 
 package IkiWiki::PageSpec;
 

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

        shift;
        my $plugin=shift;
        
        shift;
        my $plugin=shift;
        


@@ -72,9 +81,9 @@ sub match_enabled ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("$plugin is not enabled");
        }
        else {
                return IkiWiki::FailReason->new("$plugin is not enabled");
        }

-} #}}}
+}

 
 

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

        shift;
        my $glob=shift;
        my %params=@_;
        shift;
        my $glob=shift;
        my %params=@_;


@@ -86,9 +95,9 @@ sub match_sourcepage ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("sourcepage does not match $glob");
        }
        else {
                return IkiWiki::FailReason->new("sourcepage does not match $glob");
        }

-} #}}}
+}

 
 

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

        shift;
        my $glob=shift;
        my %params=@_;
        shift;
        my $glob=shift;
        my %params=@_;


@@ -100,9 +109,9 @@ sub match_destpage ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("destpage does not match $glob");
        }
        else {
                return IkiWiki::FailReason->new("destpage does not match $glob");
        }

-} #}}}
+}

 
 

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

        shift;
        shift;
        my %params=@_;
        shift;
        shift;
        my %params=@_;


@@ -114,6 +123,6 @@ sub match_included ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
        }
        else {
                return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
        }

-} #}}}
+}

 
 1
 
 1