Use bzr --quiet to avoid it outputting stuff and messing up http headers. (Scott...

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 2682e13ae5b6e76ac67df22c59319dba07fac51a..18324914b0f1535659e5909dd2fcee28a536c43d 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -165,18 +165,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);
        }


@@ -206,9 +211,19 @@ sub render ($) { #{{{
                writefile($output, $config{destdir}, genpage($page, $content));
        }
        else {
                writefile($output, $config{destdir}, genpage($page, $content));
        }
        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 top 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;


@@ -325,17 +340,17 @@ sub refresh () { #{{{
                        }
                        else {
                                push @add, $file;
                        }
                        else {
                                push @add, $file;

-                       }
-                       $pagecase{lc $page}=$page;
-                       if ($config{getctime} && -e "$config{srcdir}/$file") {
-                               eval {
-                                       my $time=rcs_getctime("$config{srcdir}/$file");
-                                       $pagectime{$page}=$time;
-                               };
-                               if ($@) {
-                                       print STDERR $@;
+                               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;

                        if (! exists $pagectime{$page}) {
                                $pagectime{$page}=mtime(srcfile($file));
                        }
                        if (! exists $pagectime{$page}) {
                                $pagectime{$page}=mtime(srcfile($file));
                        }