inline: The optimisation in 2.41 broke nested inlines. Detect those and avoid overopt...

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index a42cdc4224ddee61f6d07685788d832bdf0ab028..eb01a422764b8236a88f8443165e36e753f0b922 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -85,12 +85,6 @@ sub genpage ($$) { #{{{
                $actions++;
        }
                
                $actions++;
        }
                

-       if ($config{rcs} && exists $config{recentchangespage} &&
-           $page ne $config{recentchangespage}) {
-               $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
-               $actions++;
-       }
-

        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;


@@ -132,6 +126,7 @@ sub genpage ($$) { #{{{
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),

+               ctime => displaytime($pagectime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -151,12 +146,6 @@ sub genpage ($$) { #{{{
        return $content;
 } #}}}
 
        return $content;
 } #}}}
 

-sub mtime ($) { #{{{
-       my $file=shift;
-       
-       return (stat($file))[9];
-} #}}}
-

 sub scan ($) { #{{{
        my $file=shift;
 
 sub scan ($) { #{{{
        my $file=shift;
 


@@ -170,18 +159,23 @@ sub scan ($) { #{{{
                # Always needs to be done, since filters might add links
                # to the content.
                $content=filter($page, $page, $content);
                # Always needs to be done, since filters might add links
                # to the content.
                $content=filter($page, $page, $content);

-
-               my @links;
-               while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
-                       push @links, linkpage($2);
-               }
+       

                if ($config{discussion}) {
                        # Discussion links are a special case since they're
                        # not in the text of the page, but on its template.
                if ($config{discussion}) {
                        # Discussion links are a special case since they're
                        # not in the text of the page, but on its template.

-                       push @links, $page."/".gettext("discussion");
+                       $links{$page}=[ $page."/".gettext("discussion") ];

                }
                }

-               $links{$page}=\@links;
-               
+               else {
+                       $links{$page}=[];
+               }
+
+               run_hooks(scan => sub {
+                       shift->(
+                               page => $page,
+                               content => $content,
+                       );
+               });
+

                # Preprocess in scan-only mode.
                preprocess($page, $page, $content, 1);
        }
                # Preprocess in scan-only mode.
                preprocess($page, $page, $content, 1);
        }


@@ -209,12 +203,21 @@ sub render ($) { #{{{
                
                my $output=htmlpage($page);
                writefile($output, $config{destdir}, genpage($page, $content));
                
                my $output=htmlpage($page);
                writefile($output, $config{destdir}, genpage($page, $content));

-               utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output);

        }
        else {
        }
        else {

-               my $srcfd=readfile($srcfile, 1, 1);

                delete $depends{$file};
                will_render($file, $file, 1);
                delete $depends{$file};
                will_render($file, $file, 1);

+               
+               if ($config{hardlink}) {
+                       prep_writefile($file, $config{destdir});
+                       unlink($config{destdir}."/".$file);
+                       if (link($srcfile, $config{destdir}."/".$file)) {
+                               return;
+                       }
+                       # if hardlink fails, fall back to copying
+               }
+               
+               my $srcfd=readfile($srcfile, 1, 1);

                writefile($file, $config{destdir}, undef, 1, sub {
                        my $destfd=shift;
                        my $cleanup=shift;
                writefile($file, $config{destdir}, undef, 1, sub {
                        my $destfd=shift;
                        my $cleanup=shift;


@@ -235,7 +238,6 @@ sub render ($) { #{{{
                                }
                        }
                });
                                }
                        }
                });

-               utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file);

        }
 } #}}}
 
        }
 } #}}}
 


@@ -275,7 +277,7 @@ sub refresh () { #{{{
                        if (file_pruned($_, $config{srcdir})) {
                                $File::Find::prune=1;
                        }
                        if (file_pruned($_, $config{srcdir})) {
                                $File::Find::prune=1;
                        }

-                       elsif (! -d $_ && ! -l $_) {
+                       elsif (! -l $_ && ! -d _) {

                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
                                        warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
                                        warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");


@@ -296,7 +298,7 @@ sub refresh () { #{{{
                                if (file_pruned($_, $dir)) {
                                        $File::Find::prune=1;
                                }
                                if (file_pruned($_, $dir)) {
                                        $File::Find::prune=1;
                                }

-                               elsif (! -d $_ && ! -l $_) {
+                               elsif (! -l $_ && ! -d _) {

                                        my ($f)=/$config{wiki_file_regexp}/; # untaint
                                        if (! defined $f) {
                                                warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
                                        my ($f)=/$config{wiki_file_regexp}/; # untaint
                                        if (! defined $f) {
                                                warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");


@@ -306,8 +308,8 @@ sub refresh () { #{{{
                                                # avoid underlaydir
                                                # override attacks; see
                                                # security.mdwn
                                                # avoid underlaydir
                                                # override attacks; see
                                                # security.mdwn

-                                               if (! -e "$config{srcdir}/$f" && 
-                                                   ! -l "$config{srcdir}/$f") {
+                                               if (! -l "$config{srcdir}/$f" && 
+                                                   ! -e _) {

                                                        my $page=pagename($f);
                                                        if (! $exists{$page}) {
                                                                push @files, $f;
                                                        my $page=pagename($f);
                                                        if (! $exists{$page}) {
                                                                push @files, $f;


@@ -321,7 +323,6 @@ sub refresh () { #{{{
        };
 
        my (%rendered, @add, @del, @internal);
        };
 
        my (%rendered, @add, @del, @internal);

-

        # 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);


@@ -332,13 +333,19 @@ sub refresh () { #{{{
                        }
                        else {
                                push @add, $file;
                        }
                        else {
                                push @add, $file;

+                               if ($config{getctime} && -e "$config{srcdir}/$file") {
+                                       eval {
+                                               my $time=rcs_getctime("$config{srcdir}/$file");
+                                               $pagectime{$page}=$time;
+                                       };
+                                       if ($@) {
+                                               print STDERR $@;
+                                       }
+                               }

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

-                       if ($config{getctime} && -e "$config{srcdir}/$file") {
-                               $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
-                       }
-                       elsif (! exists $pagectime{$page}) {
-                               $pagectime{$page}=mtime(srcfile($file));
+                       if (! exists $pagectime{$page}) {
+                               $pagectime{$page}=(srcfile_stat($file))[10];

                        }
                }
        }
                        }
                }
        }


@@ -369,17 +376,15 @@ sub refresh () { #{{{
        my @needsbuild;
        foreach my $file (@files) {
                my $page=pagename($file);
        my @needsbuild;
        foreach my $file (@files) {
                my $page=pagename($file);

-               
-               my $mtime=mtime(srcfile($file));
+               my ($srcfile, @stat)=srcfile_stat($file);

                if (! exists $pagemtime{$page} ||
                if (! exists $pagemtime{$page} ||

-                   $mtime > $pagemtime{$page} ||
+                   $stat[9] > $pagemtime{$page} ||

                    $forcerebuild{$page}) {
                    $forcerebuild{$page}) {

-                       $pagemtime{$page}=$mtime;
+                       $pagemtime{$page}=$stat[9];

                        if (isinternal($page)) {
                                push @internal, $file;
                                # Preprocess internal page in scan-only mode.
                        if (isinternal($page)) {
                                push @internal, $file;
                                # Preprocess internal page in scan-only mode.

-                               my $content=readfile(srcfile($file));
-                               preprocess($page, $page, $content, 1);
+                               preprocess($page, $page, readfile($srcfile), 1);

                        }
                        else {
                                push @needsbuild, $file;
                        }
                        else {
                                push @needsbuild, $file;


@@ -503,8 +508,6 @@ sub refresh () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{

-       loadplugins();
-       checkconfig();

        lockwiki();
        loadindex();
        unlockwiki();
        lockwiki();
        loadindex();
        unlockwiki();


@@ -522,7 +525,7 @@ sub commandline_render () { #{{{
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);

-       $pagemtime{$page}=mtime($srcfile);
+       $pagemtime{$page}=(stat($srcfile))[9];

 
        print genpage($page, $content);
        exit 0;
 
        print genpage($page, $content);
        exit 0;