add support for mass dependencies

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index adae5d8c10519cad951c49c0347d866856a41a91..0ac49ade9a155c9e52e01413517b4c1e34780e47 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,13 +13,13 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
        %pagestate %wikistate %renderedfiles %oldrenderedfiles
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
        %pagestate %wikistate %renderedfiles %oldrenderedfiles

-       %pagesources %destsources %depends %depends_simple %hooks
-       %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
+       %pagesources %destsources %depends %depends_simple @mass_depends 
+       %hooks %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks

        %autofiles};
 
 use Exporter q{import};
        %autofiles};
 
 use Exporter q{import};

-our @EXPORT = qw(hook debug error template htmlpage deptype
-       add_depends pagespec_match pagespec_match_list bestlink
+our @EXPORT = qw(hook debug error htmlpage template template_depends
+       deptype add_depends pagespec_match pagespec_match_list bestlink

        htmllink readfile writefile pagetype srcfile pagename
        displaytime will_render gettext ngettext urlto targetpage
        add_underlay pagetitle titlepage linkpage newpagefile
        htmllink readfile writefile pagetype srcfile pagename
        displaytime will_render gettext ngettext urlto targetpage
        add_underlay pagetitle titlepage linkpage newpagefile


@@ -157,13 +157,6 @@ sub getsetup () {
                safe => 0, # path
                rebuild => 1,
        },
                safe => 0, # path
                rebuild => 1,
        },

-       templatedirs => {
-               type => "internal",
-               default => [],
-               description => "additional directories containing template files",
-               safe => 0,
-               rebuild => 0,
-       },

        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",
        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",


@@ -1087,14 +1080,16 @@ sub htmllink ($$$;@) {
                $bestlink=htmlpage($bestlink);
 
                if (! $destsources{$bestlink}) {
                $bestlink=htmlpage($bestlink);
 
                if (! $destsources{$bestlink}) {

-                       return $linktext unless length $config{cgiurl};
-                       return "<span class=\"createlink\"><a href=\"".
-                               cgiurl(
-                                       do => "create",
-                                       page => lc($link),
-                                       from => $lpage
-                               ).
-                               "\" rel=\"nofollow\">?</a>$linktext</span>"
+                       my $cgilink = "";
+                       if (length $config{cgiurl}) {
+                               $cgilink = "<a href=\"".
+                                       cgiurl(
+                                               do => "create",
+                                               page => lc($link),
+                                               from => $lpage
+                                       )."\" rel=\"nofollow\">?</a>";
+                       }
+                       return "<span class=\"createlink\">$cgilink$linktext</span>"

                }
        }
        
                }
        }
        


@@ -1657,39 +1652,63 @@ sub saveindex () {
 }
 
 sub template_file ($) {
 }
 
 sub template_file ($) {

-       my $template=shift;
+       my $name=shift;
+       
+       my $tpage=($name =~ s/^\///) ? $name : "templates/$name";
+       if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
+               $tpage=$pagesources{$tpage};
+               $name.=".tmpl";
+       }
+
+       my $template=srcfile($tpage, 1);
+       if (! defined $template) {
+               $name=~s:/::; # avoid path traversal
+               foreach my $dir ($config{templatedir},
+                                "$installdir/share/ikiwiki/templates") {
+                       if (-e "$dir/$name") {
+                               $template="$dir/$name";
+                               last;
+                       }
+               }
+       }

 
 

-       foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
-                        "$installdir/share/ikiwiki/templates") {
-               return "$dir/$template" if -e "$dir/$template";
+       if (defined $template) {        
+               return $template, $tpage if wantarray;
+               return $template;

        }
        return;
 }
 
        }
        return;
 }
 

-sub template_params (@) {
-       my $filename=template_file(shift);
-
-       if (! defined $filename) {
-               return if wantarray;
-               return "";
+sub template_depends ($$;@) {
+       my $name=shift;
+       my $page=shift;
+       
+       my ($filename, $tpage)=template_file($name);
+       if (defined $page && defined $tpage) {
+               add_depends($page, $tpage);

        }
 
        }
 

-       my @ret=(
+       return unless defined $filename;
+
+       my @opts=(

                filter => sub {
                        my $text_ref = shift;
                        ${$text_ref} = decode_utf8(${$text_ref});
                },
                filter => sub {
                        my $text_ref = shift;
                        ${$text_ref} = decode_utf8(${$text_ref});
                },

-               filename => $filename,

                loop_context_vars => 1,
                die_on_bad_params => 0,
                loop_context_vars => 1,
                die_on_bad_params => 0,

-               @_
+               filename => $filename,
+               @_,
+               no_includes => 1,

        );
        );

-       return wantarray ? @ret : {@ret};
+       return @opts if wantarray;
+
+       require HTML::Template;
+       return HTML::Template->new(@opts);

 }
 
 sub template ($;@) {
 }
 
 sub template ($;@) {

-       require HTML::Template;
-       return HTML::Template->new(template_params(@_));
+       template_depends(shift, undef, @_);

 }
 
 sub misctemplate ($$;@) {
 }
 
 sub misctemplate ($$;@) {


@@ -1817,10 +1836,12 @@ sub add_depends ($$;$) {
        foreach my $p (keys %pagesources) {
                my $r=$sub->($p, location => $page);
                my $i=$r->influences;
        foreach my $p (keys %pagesources) {
                my $r=$sub->($p, location => $page);
                my $i=$r->influences;

+               my $static=$r->influences_static;

                foreach my $k (keys %$i) {
                foreach my $k (keys %$i) {

+                       next unless $r || $static || $k eq $page;

                        $depends_simple{$page}{lc $k} |= $i->{$k};
                }
                        $depends_simple{$page}{lc $k} |= $i->{$k};
                }

-               last if $r->influences_static;
+               last if $static;

        }
 
        $depends{$page}{$pagespec} |= $deptype;
        }
 
        $depends{$page}{$pagespec} |= $deptype;


@@ -2144,6 +2165,9 @@ sub pagespec_match_list ($$;@) {
                my $r=$sub->($p, %params, location => $page);
                error(sprintf(gettext("cannot match pages: %s"), $r))
                        if $r->isa("IkiWiki::ErrorReason");
                my $r=$sub->($p, %params, location => $page);
                error(sprintf(gettext("cannot match pages: %s"), $r))
                        if $r->isa("IkiWiki::ErrorReason");

+               unless ($r || $r->influences_static) {
+                       $r->remove_influence($p);
+               }

                $accum |= $r;
                if ($r) {
                        push @matches, $p;
                $accum |= $r;
                if ($r) {
                        push @matches, $p;


@@ -2229,7 +2253,7 @@ sub merge_influences {
        my $anded=shift;
 
        if (! $anded || (($this || %{$this->[1]}) &&
        my $anded=shift;
 
        if (! $anded || (($this || %{$this->[1]}) &&

-                       ($other || %{$other->[1]}))) {
+                        ($other || %{$other->[1]}))) {

                foreach my $influence (keys %{$other->[1]}) {
                        $this->[1]{$influence} |= $other->[1]{$influence};
                }
                foreach my $influence (keys %{$other->[1]}) {
                        $this->[1]{$influence} |= $other->[1]{$influence};
                }


@@ -2240,6 +2264,13 @@ sub merge_influences {
        }
 }
 
        }
 }
 

+sub remove_influence {
+       my $this=shift;
+       my $torm=shift;
+
+       delete $this->[1]{$torm};
+}
+

 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';
 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';


@@ -2253,7 +2284,7 @@ sub derel ($$) {
        if ($path =~ m!^\./!) {
                $from=~s#/?[^/]+$## if defined $from;
                $path=~s#^\./##;
        if ($path =~ m!^\./!) {
                $from=~s#/?[^/]+$## if defined $from;
                $path=~s#^\./##;

-               $path="$from/$path" if length $from;
+               $path="$from/$path" if defined $from && length $from;

        }
 
        return $path;
        }
 
        return $path;