syntax

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5953b3feef93c9af06b8a491141635f3552fae82..599bb26e2b382a7b139f3fc415db9442a11c195a 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -58,6 +58,52 @@ sub backlinks ($) {
        return @links;
 }
 
        return @links;
 }
 

+sub find_changed_links (@_) {
+       my %linkchanged;
+       my %linkchangers;
+       foreach my $file (@_) {
+               my $page=pagename($file);
+       
+               if (exists $links{$page}) {
+                       foreach my $l (@{$links{$page}}) {
+                               my $link=bestlink($page, $l);
+                               if (length $link) {
+                                       if (! exists $oldlinks{$page} ||
+                                           ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}}) {
+                                               $linkchanged{$link}=1;
+                                               $linkchangers{lc($page)}=1;
+                                       }
+                               }
+                               else {
+                                       if (! grep { lc $_ eq lc $l } @{$oldlinks{$page}}) {
+                                               $linkchangers{lc($page)}=1
+                                       }
+                               }
+                               
+                       }
+               }
+               if (exists $oldlinks{$page}) {
+                       foreach my $l (@{$oldlinks{$page}}) {
+                               my $link=bestlink($page, $l);
+                               if (length $link) {
+                                       if (! exists $links{$page} || 
+                                           ! grep { bestlink($page, $_) eq $link } @{$links{$page}}) {
+                                               $linkchanged{$link}=1;
+                                               $linkchangers{lc($page)}=1;
+                                       }
+                               }
+                               else {
+                                       if (! grep { lc $_ eq lc $l } @{$links{$page}}) {
+                                               $linkchangers{lc($page)}=1
+                                       }
+                               }
+                       }
+               }
+       }
+
+       return \%linkchanged, \%linkchangers;
+}
+

 sub genpage ($$) {
        my $page=shift;
        my $content=shift;
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;


@@ -342,7 +388,7 @@ sub refresh () {
        run_hooks(refresh => sub { shift->() });
        my ($files, $exists)=find_src_files();
 
        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);
        # check for added or removed pages
        foreach my $file (@$files) {
                my $page=pagename($file);


@@ -407,7 +453,7 @@ sub refresh () {
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$stat[9];
                        if (isinternal($page)) {
                    $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);
                        }
                                # Preprocess internal page in scan-only mode.
                                preprocess($page, $page, readfile($srcfile), 1);
                        }


@@ -429,7 +475,7 @@ sub refresh () {
                render($file);
                $rendered{$file}=1;
        }
                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};
                # internal pages are not rendered
                my $page=pagename($file);
                delete $depends{$page};


@@ -454,79 +500,90 @@ sub refresh () {
                }
        }
 
                }
        }
 

-       if (%rendered || @del || @internal) {
+       if (%rendered || @del || @internal || @internal_change) {

                my @changed=(keys %rendered, @del);
                my @changed=(keys %rendered, @del);

+               my ($linkchanged, $linkchangers)=find_changed_links(@changed);

 
 

-               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} && ! 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;
+               my $unsettled;
+               do {
+                       $unsettled=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 &&
+                                                    $lc_changed{$d})
+                                                   ||
+                                                   ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+                                                    $lc_exists_changed{$d})
+                                                   ||
+                                                   ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
+                                                    $linkchangers->{$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
+                                               my $internal_dep=$d =~ /internal\(/;
+
+                                               my @candidates;
+                                               if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+                                                       @candidates=@exists_changed;
+                                                       push @candidates, @internal
+                                                               if $internal_dep;
+                                               }
+                                               if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
+                                                       @candidates=@changed;
+                                                       push @candidates, @internal, @internal_change
+                                                               if $internal_dep;
+                                               }

 
 

-                       if (defined $reason) {
-                               debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
-                               render($f);
-                               $rendered{$f}=1;
-                       }
-               }
-               
-               # handle backlinks; if a page has added/removed links,
-               # update the pages it links to
-               my %linkchanged;
-               foreach my $file (@changed) {
-                       my $page=pagename($file);
-                       
-                       if (exists $links{$page}) {
-                               foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
-                                       if (length $link &&
-                                           (! exists $oldlinks{$page} ||
-                                            ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}})) {
-                                               $linkchanged{$link}=1;
+                                               foreach my $file (@candidates) {
+                                                       next if $file eq $f;
+                                                       my $page=pagename($file);
+                                                       if ($sub->($page, location => $p)) {
+                                                               if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
+                                                                       next unless $linkchangers->{lc($page)};
+                                                               }
+                                                               $reason = $page;
+                                                               last D;
+                                                       }
+                                               }

                                        }
                                }
                                        }
                                }

-                       }
-                       if (exists $oldlinks{$page}) {
-                               foreach my $link (map { bestlink($page, $_) } @{$oldlinks{$page}}) {
-                                       if (length $link &&
-                                           (! exists $links{$page} || 
-                                            ! grep { bestlink($page, $_) eq $link } @{$links{$page}})) {
-                                               $linkchanged{$link}=1;
-                                       }
+       
+                               if (defined $reason) {
+                                       debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+                                       render($f);
+                                       $rendered{$f}=1;
+                                       $unsettled=1;
+                                       last;

                                }
                        }
                                }
                        }

-               }
-
-               foreach my $link (keys %linkchanged) {
+               } while $unsettled;
+               
+               # update backlinks at end
+               foreach my $link (keys %{$linkchanged}) {

                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                                next if $rendered{$linkfile};
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                                next if $rendered{$linkfile};


@@ -554,7 +611,6 @@ sub refresh () {
        if (%rendered) {
                run_hooks(change => sub { shift->(keys %rendered) });
        }
        if (%rendered) {
                run_hooks(change => sub { shift->(keys %rendered) });
        }

-       run_hooks(postrefresh => sub { shift->() });

 }
 
 sub commandline_render () {
 }
 
 sub commandline_render () {