minor optimisation

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 121fc97e374533dbf5cb91f46059ff6926394e0e..09b646f75f0c1be520355b6beacc409ad119c086 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -210,7 +210,7 @@ sub render ($) {
        if (defined $type) {
                my $page=pagename($file);
                delete $depends{$page};
-               delete $depends_exact{$page};
+               delete $depends_simple{$page};
                will_render($page, htmlpage($page), 1);
                return if $type=~/^_/;
                
@@ -225,7 +225,7 @@ sub render ($) {
        }
        else {
                delete $depends{$file};
-               delete $depends_exact{$file};
+               delete $depends_simple{$file};
                will_render($file, $file, 1);
                
                if ($config{hardlink}) {
@@ -433,7 +433,7 @@ sub refresh () {
                # internal pages are not rendered
                my $page=pagename($file);
                delete $depends{$page};
-               delete $depends_exact{$page};
+               delete $depends_simple{$page};
                foreach my $old (@{$renderedfiles{$page}}) {
                        delete $destsources{$old};
                }
@@ -455,47 +455,56 @@ sub refresh () {
        }
 
        if (%rendered || @del || @internal) {
-               my @changed=(keys %rendered, @del);
-
-               my %changedpages = map { pagename($_) => 1 } @changed;
- 
-               # rebuild dependant pages
-               F: foreach my $f (@$files) {
-                       next if $rendered{$f};
-                       my $p=pagename($f);
-
-                       if (exists $depends_exact{$p}) {
-                               foreach my $d (keys %{$depends_exact{$p}}) {
-                                       if (exists $changedpages{$d}) {
-                                               debug(sprintf(gettext("building %s, which depends on %s"), $f, $p));
-                                               render($f);
-                                               $rendered{$f}=1;
-                                               next F;
+               my @changed;
+               my $changes;
+               do {
+                       $changes=0;
+                       @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 (exists $depends{$p}) {
-                               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)) {
-                                                       debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
-                                                       render($f);
-                                                       $rendered{$f}=1;
-                                                       next F;
+       
+                               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 (defined $reason) {
+                                       debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+                                       render($f);
+                                       $rendered{$f}=1;
+                                       $changes++;
+                                       last;
+                               }
                        }
-               }
+               } while $changes;
                
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to