]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Render.pm
Merge branch 'master' into dependency-types
[git.ikiwiki.info.git] / IkiWiki / Render.pm
index 5953b3feef93c9af06b8a491141635f3552fae82..cf0c3fe0822a8d9ee0c7d47076c35d25e315baff 100644 (file)
@@ -342,7 +342,7 @@ sub refresh () {
        run_hooks(refresh => sub { shift->() });
        my ($files, $exists)=find_src_files();
 
-       my (%rendered, @add, @del, @internal);
+       my (%rendered, @add, @del, @internal, @internal_change);
        # check for added or removed pages
        foreach my $file (@$files) {
                my $page=pagename($file);
@@ -407,7 +407,7 @@ sub refresh () {
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$stat[9];
                        if (isinternal($page)) {
-                               push @internal, $file;
+                               push @internal_change, $file;
                                # Preprocess internal page in scan-only mode.
                                preprocess($page, $page, readfile($srcfile), 1);
                        }
@@ -429,7 +429,7 @@ sub refresh () {
                render($file);
                $rendered{$file}=1;
        }
-       foreach my $file (@internal) {
+       foreach my $file (@internal, @internal_change) {
                # internal pages are not rendered
                my $page=pagename($file);
                delete $depends{$page};
@@ -454,51 +454,80 @@ sub refresh () {
                }
        }
 
-       if (%rendered || @del || @internal) {
-               my @changed=(keys %rendered, @del);
-
-               my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
-               # rebuild dependant pages
-               foreach my $f (@$files) {
-                       next if $rendered{$f};
-                       my $p=pagename($f);
-                       my $reason = undef;
-
-                       if (exists $depends_simple{$p}) {
-                               foreach my $d (keys %{$depends_simple{$p}}) {
-                                       if (exists $lcchanged{$d}) {
-                                               $reason = $d;
-                                               last;
+       if (%rendered || @del || @internal || @internal_change) {
+               my @changed;
+               my $changes;
+               do {
+                       $changes=0;
+                       @changed=(keys %rendered, @del);
+                       my @exists_changed=(@add, @del);
+       
+                       my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+                       my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+        
+                       # rebuild dependant pages
+                       foreach my $f (@$files) {
+                               next if $rendered{$f};
+                               my $p=pagename($f);
+                               my $reason = undef;
+       
+                               if (exists $depends_simple{$p}) {
+                                       foreach my $d (keys %{$depends_simple{$p}}) {
+                                               if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
+                                                    exists $lc_changed{$d})
+                                                   ||
+                                                   ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+                                                    exists $lc_exists_changed{$d})) {
+                                                       $reason = $d;
+                                                       last;
+                                               }
                                        }
                                }
-                       }
-
-                       if (exists $depends{$p} && ! defined $reason) {
-                               D: foreach my $d (keys %{$depends{$p}}) {
-                                       my $sub=pagespec_translate($d);
-                                       next if $@ || ! defined $sub;
-
-                                       # only consider internal files
-                                       # if the page explicitly depends
-                                       # on such files
-                                       foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
-                                               next if $file eq $f;
-                                               my $page=pagename($file);
-                                               if ($sub->($page, location => $p)) {
-                                                       $reason = $page;
-                                                       last D;
+       
+                               if (exists $depends{$p} && ! defined $reason) {
+                                       D: foreach my $d (keys %{$depends{$p}}) {
+                                               my $sub=pagespec_translate($d);
+                                               next if $@ || ! defined $sub;
+       
+                                               my @candidates;
+                                               if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
+                                                       @candidates=@changed;
+                                               }
+                                               elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+                                                       @candidates=@exists_changed;
+                                               }
+                                               # only consider internal files
+                                               # if the page explicitly depends
+                                               # on such files
+                                               if ($d =~ /internal\(/) {
+                                                       if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
+                                                               push @candidates, @internal, @internal_change;
+                                                       }
+                                                       elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+                                                               push @candidates, @internal;
+                                                       }
+                                               }
+       
+                                               foreach my $file (@candidates) {
+                                                       next if $file eq $f;
+                                                       my $page=pagename($file);
+                                                       if ($sub->($page, location => $p)) {
+                                                               $reason = $page;
+                                                               last D;
+                                                       }
                                                }
                                        }
                                }
+       
+                               if (defined $reason) {
+                                       debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+                                       render($f);
+                                       $rendered{$f}=1;
+                                       $changes++;
+                                       last;
+                               }
                        }
-
-                       if (defined $reason) {
-                               debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
-                               render($f);
-                               $rendered{$f}=1;
-                       }
-               }
+               } while $changes;
                
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to
@@ -554,7 +583,6 @@ sub refresh () {
        if (%rendered) {
                run_hooks(change => sub { shift->(keys %rendered) });
        }
-       run_hooks(postrefresh => sub { shift->() });
 }
 
 sub commandline_render () {