Merge branch 'master' into autoconfig

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 2682e13ae5b6e76ac67df22c59319dba07fac51a..cb92d1ade947290edef6afd14636fd4d15c8ca63 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -47,23 +47,6 @@ sub backlinks ($) { #{{{
        return @links;
 } #}}}
 
        return @links;
 } #}}}
 

-sub parentlinks ($) { #{{{
-       my $page=shift;
-       
-       my @ret;
-       my $pagelink="";
-       my $path="";
-       my $title=$config{wikiname};
-       
-       foreach my $dir (split("/", $page)) {
-               next if $dir eq 'index';
-               push @ret, { url => urlto($path, $page), page => $title };
-               $path.="/".$dir;
-               $title=pagetitle($dir);
-       }
-       return @ret;
-} #}}}
-

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


@@ -80,12 +63,12 @@ sub genpage ($$) { #{{{
        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {

-               $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
+               $template->param(editurl => cgiurl(do => "edit", page => $page));

                $template->param(prefsurl => cgiurl(do => "prefs"));
                $actions++;
        }
                
                $template->param(prefsurl => cgiurl(do => "prefs"));
                $actions++;
        }
                

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

                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
                $template->param(historyurl => $u);
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
                $template->param(historyurl => $u);


@@ -121,7 +104,6 @@ sub genpage ($$) { #{{{
                        ? $config{wikiname} 
                        : pagetitle(basename($page)),
                wikiname => $config{wikiname},
                        ? $config{wikiname} 
                        : pagetitle(basename($page)),
                wikiname => $config{wikiname},

-               parentlinks => [parentlinks($page)],

                content => $content,
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                content => $content,
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,


@@ -135,6 +117,10 @@ sub genpage ($$) { #{{{
        });
        
        $content=$template->output;
        });
        
        $content=$template->output;

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

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


@@ -146,12 +132,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;
 


@@ -162,21 +142,22 @@ sub scan ($) { #{{{
                my $page=pagename($file);
                will_render($page, htmlpage($page), 1);
 
                my $page=pagename($file);
                will_render($page, htmlpage($page), 1);
 

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


@@ -185,6 +166,30 @@ sub scan ($) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub fast_file_copy (@) { #{{{
+       my $srcfile=shift;
+       my $destfile=shift;
+       my $srcfd=shift;
+       my $destfd=shift;
+       my $cleanup=shift;
+
+       my $blksize = 16384;
+       my ($len, $buf, $written);
+       while ($len = sysread $srcfd, $buf, $blksize) {
+               if (! defined $len) {
+                       next if $! =~ /^Interrupted/;
+                       error("failed to read $srcfile: $!", $cleanup);
+               }
+               my $offset = 0;
+               while ($len) {
+                       defined($written = syswrite $destfd, $buf, $len, $offset)
+                               or error("failed to write $destfile: $!", $cleanup);
+                       $len -= $written;
+                       $offset += $written;
+               }
+       }
+}
+

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


@@ -196,7 +201,7 @@ sub render ($) { #{{{
                will_render($page, htmlpage($page), 1);
                return if $type=~/^_/;
                
                will_render($page, htmlpage($page), 1);
                return if $type=~/^_/;
                

-               my $content=htmlize($page, $type,
+               my $content=htmlize($page, $page, $type,

                        linkify($page, $page,
                        preprocess($page, $page,
                        filter($page, $page,
                        linkify($page, $page,
                        preprocess($page, $page,
                        filter($page, $page,


@@ -206,28 +211,25 @@ 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);

-               writefile($file, $config{destdir}, undef, 1, sub {
-                       my $destfd=shift;
-                       my $cleanup=shift;
-
-                       my $blksize = 16384;
-                       my ($len, $buf, $written);
-                       while ($len = sysread $srcfd, $buf, $blksize) {
-                               if (! defined $len) {
-                                       next if $! =~ /^Interrupted/;
-                                       error("failed to read $srcfile: $!", $cleanup);
-                               }
-                               my $offset = 0;
-                               while ($len) {
-                                       defined($written = syswrite $destfd, $buf, $len, $offset)
-                                               or error("failed to write $file: $!", $cleanup);
-                                       $len -= $written;
-                                       $offset += $written;
+               
+               if ($config{hardlink}) {
+                       # only hardlink if owned by same user
+                       my @stat=stat($srcfile);
+                       if ($stat[4] == $>) {
+                               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 {
+                       fast_file_copy($srcfile, $file, $srcfd, @_);

                });
        }
 } #}}}
                });
        }
 } #}}}


@@ -243,11 +245,11 @@ sub prune ($) { #{{{
 } #}}}
 
 sub refresh () { #{{{
 } #}}}
 
 sub refresh () { #{{{

-       # security check, avoid following symlinks in the srcdir path
+       # security check, avoid following symlinks in the srcdir path by default

        my $test=$config{srcdir};
        while (length $test) {
        my $test=$config{srcdir};
        while (length $test) {

-               if (-l $test) {
-                       error("symlink found in srcdir path ($test)");
+               if (-l $test && ! $config{allow_symlinks_before_srcdir}) {
+                       error("symlink found in srcdir path ($test) -- set allow_symlinks_before_srcdir to allow this");

                }
                unless ($test=~s/\/+$//) {
                        $test=dirname($test);
                }
                unless ($test=~s/\/+$//) {
                        $test=dirname($test);


@@ -268,7 +270,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");


@@ -289,7 +291,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");


@@ -299,8 +301,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;


@@ -314,10 +316,13 @@ 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);

+               if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
+                       # the page has changed its type
+                       $forcerebuild{$page}=1;
+               }

                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
                        if (isinternal($page)) {
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
                        if (isinternal($page)) {


@@ -325,19 +330,19 @@ 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}) {
                        if (! exists $pagectime{$page}) {

-                               $pagectime{$page}=mtime(srcfile($file));
+                               $pagectime{$page}=(srcfile_stat($file))[10];

                        }
                }
        }
                        }
                }
        }


@@ -368,16 +373,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.

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

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


@@ -501,8 +505,6 @@ sub refresh () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{

-       loadplugins();
-       checkconfig();

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


@@ -519,8 +521,8 @@ sub commandline_render () { #{{{
        $content=filter($page, $page, $content);
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=filter($page, $page, $content);
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);

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

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