code checking for locked pages into a new "lockedit" plugin. Both are
* Avoid using lots of memory when copying large non-html files. Yes, you can keep videos in the wiki..master
parent
762ecf9461
commit
97aea86162
|
@ -231,9 +231,10 @@ sub srcfile ($) { #{{{
|
|||
error("internal error: $file cannot be found");
|
||||
} #}}}
|
||||
|
||||
sub readfile ($;$) { #{{{
|
||||
sub readfile ($;$$) { #{{{
|
||||
my $file=shift;
|
||||
my $binary=shift;
|
||||
my $wantfd=shift;
|
||||
|
||||
if (-l $file) {
|
||||
error("cannot read a symlink ($file)");
|
||||
|
@ -242,16 +243,18 @@ sub readfile ($;$) { #{{{
|
|||
local $/=undef;
|
||||
open (IN, $file) || error("failed to read $file: $!");
|
||||
binmode(IN) if ($binary);
|
||||
return \*IN if $wantfd;
|
||||
my $ret=<IN>;
|
||||
close IN;
|
||||
return $ret;
|
||||
} #}}}
|
||||
|
||||
sub writefile ($$$;$) { #{{{
|
||||
sub writefile ($$$;$$) { #{{{
|
||||
my $file=shift; # can include subdirs
|
||||
my $destdir=shift; # directory to put file in
|
||||
my $content=shift;
|
||||
my $binary=shift;
|
||||
my $wantfd=shift;
|
||||
|
||||
my $test=$file;
|
||||
while (length $test) {
|
||||
|
@ -274,6 +277,7 @@ sub writefile ($$$;$) { #{{{
|
|||
|
||||
open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
|
||||
binmode(OUT) if ($binary);
|
||||
return \*OUT if $wantfd;
|
||||
print OUT $content;
|
||||
close OUT;
|
||||
} #}}}
|
||||
|
|
|
@ -195,10 +195,25 @@ sub render ($) { #{{{
|
|||
$oldpagemtime{$page}=time;
|
||||
}
|
||||
else {
|
||||
my $content=readfile($srcfile, 1);
|
||||
my $srcfd=readfile($srcfile, 1, 1);
|
||||
delete $depends{$file};
|
||||
will_render($file, $file, 1);
|
||||
writefile($file, $config{destdir}, $content, 1);
|
||||
my $destfd=writefile($file, $config{destdir}, undef, 1, 1);
|
||||
my $blksize = 16384;
|
||||
my ($len, $buf, $written);
|
||||
while ($len = sysread $srcfd, $buf, $blksize) {
|
||||
if (! defined $len) {
|
||||
next if $! =~ /^Interrupted/;
|
||||
error("failed to read $srcfile: $!");
|
||||
}
|
||||
my $offset = 0;
|
||||
while ($len) {
|
||||
defined($written = syswrite OUT, $buf, $len, $offset)
|
||||
or error("failed to write $file: $!");
|
||||
$len -= $written;
|
||||
$offset += $written;
|
||||
}
|
||||
}
|
||||
$oldpagemtime{$file}=time;
|
||||
}
|
||||
} #}}}
|
||||
|
|
|
@ -13,8 +13,10 @@ ikiwiki (1.42) UNRELEASED; urgency=low
|
|||
* Add an opendiscussion plugin that allows anonymous users to edit
|
||||
discussion pages, on a wiki that is otherwise wouldn't allow it.
|
||||
* Lots of CGI code reorg and cleanup.
|
||||
* Avoid using lots of memory when copying large non-html files.
|
||||
Yes, you can keep videos in the wiki..
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Thu, 1 Feb 2007 15:36:38 -0500
|
||||
-- Joey Hess <joeyh@debian.org> Fri, 2 Feb 2007 21:59:04 -0500
|
||||
|
||||
ikiwiki (1.41) unstable; urgency=low
|
||||
|
||||
|
|
Loading…
Reference in New Issue