call gentag for taglinks too

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0fe20c64f3a0939d7dde93107e7b0285e883e2a2..83242a1973000eb1f6ad05364d6d7661871b1688 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -43,7 +43,7 @@ sub backlinks ($) {
        my @links;
        foreach my $p (backlink_pages($page)) {
                my $href=urlto($p, $page);
        my @links;
        foreach my $p (backlink_pages($page)) {
                my $href=urlto($p, $page);

-                
+

                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;
                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;


@@ -61,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;

+       
+       run_hooks(postscan => sub {
+               shift->(page => $page, content => $content);
+       });

 
        my $templatefile;
        run_hooks(templatefile => sub {
 
        my $templatefile;
        run_hooks(templatefile => sub {


@@ -74,11 +78,14 @@ sub genpage ($$) {
        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {

-               $template->param(editurl => cgiurl(do => "edit", page => $page))
-                       if IkiWiki->can("cgi_editpage");
-               $template->param(prefsurl => cgiurl(do => "prefs"))
-                       if exists $hooks{auth};
-               $actions++;
+               if (IkiWiki->can("cgi_editpage")) {
+                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                       $actions++;
+               }
+               if (exists $hooks{auth}) {
+                       $template->param(prefsurl => cgiurl(do => "prefs"));
+                       $actions++;
+               }

        }
                
        if (defined $config{historyurl} && length $config{historyurl}) {
        }
                
        if (defined $config{historyurl} && length $config{historyurl}) {


@@ -88,7 +95,7 @@ sub genpage ($$) {
                $actions++;
        }
        if ($config{discussion}) {
                $actions++;
        }
        if ($config{discussion}) {

-               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&

                   (length $config{cgiurl} ||
                    exists $links{$page."/".$config{discussionpage}})) {
                        $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
                   (length $config{cgiurl} ||
                    exists $links{$page."/".$config{discussionpage}})) {
                        $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));


@@ -130,10 +137,6 @@ sub genpage ($$) {
        
        $content=$template->output;
        
        
        $content=$template->output;
        

-       run_hooks(postscan => sub {
-               shift->(page => $page, content => $content);
-       });
-

        run_hooks(format => sub {
                $content=shift->(
                        page => $page,
        run_hooks(format => sub {
                $content=shift->(
                        page => $page,


@@ -164,6 +167,7 @@ sub scan ($) {
                else {
                        $links{$page}=[];
                }
                else {
                        $links{$page}=[];
                }

+               delete $typedlinks{$page};

 
                run_hooks(scan => sub {
                        shift->(
 
                run_hooks(scan => sub {
                        shift->(


@@ -277,6 +281,27 @@ sub srcdir_check () {
        
 }
 
        
 }
 

+sub verify_src_file ($$) {
+       my $file=decode_utf8(shift);
+       my $dir=shift;
+
+       return if -l $file || -d _;
+       $file=~s/^\Q$dir\E\/?//;
+       return if ! length $file;
+       my $page = pagename($file);
+       if (! exists $pagesources{$page} &&
+               file_pruned($file)) {
+               $File::Find::prune=1;
+               return;
+       }
+
+       my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
+       if (! defined $file_untainted) {
+               warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+       }
+       return ($file_untainted, $page);
+}
+

 sub find_src_files () {
        my @files;
        my %pages;
 sub find_src_files () {
        my @files;
        my %pages;


@@ -285,22 +310,9 @@ sub find_src_files () {
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

-                       my $file=decode_utf8($_);
-                       $file=~s/^\Q$config{srcdir}\E\/?//;
-                       my $page = pagename($file);
-                       if (! exists $pagesources{$page} &&
-                           file_pruned($file)) {
-                               $File::Find::prune=1;
-                               return;
-                       }
-                       return if -l $_ || -d _ || ! length $file;
-
-                       my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-                       if (! defined $f) {
-                               warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-                       }
-                       else {
-                               push @files, $f;
+                       my ($file, $page) = verify_src_file($_, $config{srcdir});
+                       if (defined $file) {
+                               push @files, $file;

                                if ($pages{$page}) {
                                        debug(sprintf(gettext("%s has multiple possible source pages"), $page));
                                }
                                if ($pages{$page}) {
                                        debug(sprintf(gettext("%s has multiple possible source pages"), $page));
                                }


@@ -312,27 +324,14 @@ sub find_src_files () {
                find({
                        no_chdir => 1,
                        wanted => sub {
                find({
                        no_chdir => 1,
                        wanted => sub {

-                               my $file=decode_utf8($_);
-                               $file=~s/^\Q$dir\E\/?//;
-                               my $page=pagename($file);
-                               if (! exists $pagesources{$page} &&
-                                   file_pruned($file)) {
-                                       $File::Find::prune=1;
-                                       return;
-                               }
-                               return if -l $_ || -d _ || ! length $file;
-
-                               my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-                               if (! defined $f) {
-                                       warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-                               }
-                               else {
+                               my ($file, $page) = verify_src_file($_, $dir);
+                               if (defined $file) {

                                        # avoid underlaydir override
                                        # attacks; see security.mdwn
                                        # avoid underlaydir override
                                        # attacks; see security.mdwn

-                                       if (! -l "$config{srcdir}/$f" && 
+                                       if (! -l "$config{srcdir}/$file" &&

                                            ! -e _) {
                                                if (! $pages{$page}) {
                                            ! -e _) {
                                                if (! $pages{$page}) {

-                                                       push @files, $f;
+                                                       push @files, $file;

                                                        $pages{$page}=1;
                                                }
                                        }
                                                        $pages{$page}=1;
                                                }
                                        }


@@ -348,6 +347,8 @@ sub find_new_files ($) {
        my @new;
        my @internal_new;
 
        my @new;
        my @internal_new;
 

+       my $times_noted;
+

        foreach my $file (@$files) {
                my $page=pagename($file);
                if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
        foreach my $file (@$files) {
                my $page=pagename($file);
                if (exists $pagesources{$page} && $pagesources{$page} ne $file) {


@@ -359,16 +360,33 @@ sub find_new_files ($) {
                        if (isinternal($page)) {
                                push @internal_new, $file;
                        }
                        if (isinternal($page)) {
                                push @internal_new, $file;
                        }

-                       else {
+                       elsif ($config{rcs}) {
+                               if (! $times_noted) {
+                                       debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+                                       $times_noted=1;
+                               }
+

                                push @new, $file;
                                push @new, $file;

-                               if ($config{getctime} && -e "$config{srcdir}/$file") {
+                               if ($config{gettime} && -e "$config{srcdir}/$file") {

                                        eval {
                                        eval {

-                                               my $time=rcs_getctime("$config{srcdir}/$file");
-                                               $pagectime{$page}=$time;
+                                               my $ctime=rcs_getctime("$config{srcdir}/$file");
+                                               if ($ctime > 0) {
+                                                       $pagectime{$page}=$ctime;
+                                               }

                                        };
                                        if ($@) {
                                                print STDERR $@;
                                        }
                                        };
                                        if ($@) {
                                                print STDERR $@;
                                        }

+                                       my $mtime;
+                                       eval {
+                                               $mtime=rcs_getmtime("$config{srcdir}/$file");
+                                       };
+                                       if ($@) {
+                                               print STDERR $@;
+                                       }
+                                       elsif ($mtime > 0) {
+                                               utime($mtime, $mtime, "$config{srcdir}/$file");
+                                       }

                                }
                        }
                        $pagecase{lc $page}=$page;
                                }
                        }
                        $pagecase{lc $page}=$page;


@@ -392,27 +410,40 @@ sub find_del_files ($) {
                                push @internal_del, $pagesources{$page};
                        }
                        else {
                                push @internal_del, $pagesources{$page};
                        }
                        else {

-                               debug(sprintf(gettext("removing old page %s"), $page));

                                push @del, $pagesources{$page};
                        }
                        $links{$page}=[];
                                push @del, $pagesources{$page};
                        }
                        $links{$page}=[];

+                       delete $typedlinks{$page};

                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;

-                       foreach my $old (@{$oldrenderedfiles{$page}}) {
-                               prune($config{destdir}."/".$old);
-                       }
-                       delete $pagesources{$page};
-                       foreach my $source (keys %destsources) {
-                               if ($destsources{$source} eq $page) {
-                                       delete $destsources{$source};
-                               }
-                       }

                }
        }
 
        return \@del, \@internal_del;
 }
 
                }
        }
 
        return \@del, \@internal_del;
 }
 

+sub remove_del (@) {
+       foreach my $file (@_) {
+               my $page=pagename($file);
+               if (! isinternal($page)) {
+                       debug(sprintf(gettext("removing old page %s"), $page));
+               }
+       
+               foreach my $old (@{$oldrenderedfiles{$page}}) {
+                       prune($config{destdir}."/".$old);
+               }
+
+               foreach my $source (keys %destsources) {
+                       if ($destsources{$source} eq $page) {
+                               delete $destsources{$source};
+                       }
+               }
+       
+               delete $pagecase{lc $page};
+               delete $pagesources{$page};
+       }
+}
+

 sub find_changed ($) {
        my $files=shift;
        my @changed;
 sub find_changed ($) {
        my $files=shift;
        my @changed;


@@ -484,6 +515,29 @@ sub remove_unrendered () {
        }
 }
 
        }
 }
 

+sub link_types_changed ($$) {
+       # each is of the form { type => { link => 1 } }
+       my $new = shift;
+       my $old = shift;
+
+       return 0 if !defined $new && !defined $old;
+       return 1 if !defined $new || !defined $old;
+
+       while (my ($type, $links) = each %$new) {
+               foreach my $link (keys %$links) {
+                       return 1 unless exists $old->{$type}{$link};
+               }
+       }
+
+       while (my ($type, $links) = each %$old) {
+               foreach my $link (keys %$links) {
+                       return 1 unless exists $new->{$type}{$link};
+               }
+       }
+
+       return 0;
+}
+

 sub calculate_changed_links ($$$) {
        my ($changed, $del, $oldlink_targets)=@_;
 
 sub calculate_changed_links ($$$) {
        my ($changed, $del, $oldlink_targets)=@_;
 


@@ -510,6 +564,14 @@ sub calculate_changed_links ($$$) {
                        }
                        $linkchangers{lc($page)}=1;
                }
                        }
                        $linkchangers{lc($page)}=1;
                }

+
+               # we currently assume that changing the type of a link doesn't
+               # change backlinks
+               if (!exists $linkchangers{lc($page)}) {
+                       if (link_types_changed($typedlinks{$page}, $oldtypedlinks{$page})) {
+                               $linkchangers{lc($page)}=1;
+                       }
+               }

        }
 
        return \%backlinkchanged, \%linkchangers;
        }
 
        return \%backlinkchanged, \%linkchangers;


@@ -550,7 +612,7 @@ sub render_dependent ($$$$$$$) {
                if (exists $depends{$p} && ! defined $reason) {
                        foreach my $dep (keys %{$depends{$p}}) {
                                my $sub=pagespec_translate($dep);
                if (exists $depends{$p} && ! defined $reason) {
                        foreach my $dep (keys %{$depends{$p}}) {
                                my $sub=pagespec_translate($dep);

-                               next if $@ || ! defined $sub;
+                               next unless defined $sub;

 
                                # only consider internal files
                                # if the page explicitly depends
 
                                # only consider internal files
                                # if the page explicitly depends


@@ -618,6 +680,37 @@ sub render_backlinks ($) {
        }
 }
 
        }
 }
 

+sub gen_autofile ($$$) {
+       my $autofile=shift;
+       my $pages=shift;
+       my $del=shift;
+       
+       if (srcfile($autofile, 1)) {
+               return 0;
+       }
+
+       my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+       
+       if ((!defined $file) ||
+           (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+               return 0;
+       }
+       
+       if ($pages->{$page}) {
+               return 0;
+       }
+
+       if (grep { $_ eq $file } @$del) {
+               $wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
+               return 0;
+       }
+
+       $autofiles{$autofile}{generator}->();
+       $pages->{$page}=1;
+       return 1;
+}
+
+

 sub refresh () {
        srcdir_check();
        run_hooks(refresh => sub { shift->() });
 sub refresh () {
        srcdir_check();
        run_hooks(refresh => sub { shift->() });


@@ -632,7 +725,19 @@ sub refresh () {
                scan($file);
        }
 
                scan($file);
        }
 

+       foreach my $autofile (keys %autofiles) {
+               if (gen_autofile($autofile, $pages, $del)) {
+                       push @{$files}, $autofile;
+                       push @{$new}, $autofile if find_new_files([$autofile]);
+                       push @{$changed}, $autofile if find_changed([$autofile]);
+                       
+                       scan($autofile);
+               }
+       }
+

        calculate_links();
        calculate_links();

+       
+       remove_del(@$del, @$internal_del);

 
        foreach my $file (@$changed) {
                render($file, sprintf(gettext("building %s"), $file));
 
        foreach my $file (@$changed) {
                render($file, sprintf(gettext("building %s"), $file));


@@ -666,6 +771,17 @@ sub refresh () {
        }
 }
 
        }
 }
 

+sub clean_rendered {
+       lockwiki();
+       loadindex();
+       remove_unrendered();
+       foreach my $page (keys %oldrenderedfiles) {
+               foreach my $file (@{$oldrenderedfiles{$page}}) {
+                       prune($config{destdir}."/".$file);
+               }
+       }
+}
+

 sub commandline_render () {
        lockwiki();
        loadindex();
 sub commandline_render () {
        lockwiki();
        loadindex();