Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add t/img.t regression test also taken from version 3.20160506
[git.ikiwiki.info.git]
/
IkiWiki
/
Render.pm
diff --git
a/IkiWiki/Render.pm
b/IkiWiki/Render.pm
index 8e8336b994070f442061e8bc2929525a77033549..a90d202eef0c10fd480b00459c1238f58052b094 100644
(file)
--- a/
IkiWiki/Render.pm
+++ b/
IkiWiki/Render.pm
@@
-93,7
+93,7
@@
sub genpage ($$) {
}
if (defined $config{historyurl} && length $config{historyurl}) {
my $u=$config{historyurl};
}
if (defined $config{historyurl} && length $config{historyurl}) {
my $u=$config{historyurl};
- my $p=uri_escape_utf8($pagesources{$page});
+ my $p=uri_escape_utf8($pagesources{$page}
, '^A-Za-z0-9\-\._~/'
);
$u=~s/\[\[file\]\]/$p/g;
$template->param(historyurl => $u);
$actions++;
$u=~s/\[\[file\]\]/$p/g;
$template->param(historyurl => $u);
$actions++;
@@
-262,12
+262,13
@@
sub render ($$) {
}
}
}
}
-sub prune ($) {
+sub prune ($
;$
) {
my $file=shift;
my $file=shift;
+ my $up_to=shift;
unlink($file);
my $dir=dirname($file);
unlink($file);
my $dir=dirname($file);
- while (rmdir($dir)) {
+ while (
(! defined $up_to || $dir =~ m{^\Q$up_to\E\/}) &&
rmdir($dir)) {
$dir=dirname($dir);
}
}
$dir=dirname($dir);
}
}
@@
-447,7
+448,7
@@
sub remove_del (@) {
}
foreach my $old (@{$oldrenderedfiles{$page}}) {
}
foreach my $old (@{$oldrenderedfiles{$page}}) {
- prune($config{destdir}."/".$old);
+ prune($config{destdir}."/".$old
, $config{destdir}
);
}
foreach my $source (keys %destsources) {
}
foreach my $source (keys %destsources) {
@@
-475,8
+476,18
@@
sub find_changed ($) {
$pagemtime{$page}=$stat[9];
if (isinternal($page)) {
$pagemtime{$page}=$stat[9];
if (isinternal($page)) {
+ my $content = readfile($srcfile);
+
# Preprocess internal page in scan-only mode.
# Preprocess internal page in scan-only mode.
- preprocess($page, $page, readfile($srcfile), 1);
+ preprocess($page, $page, $content, 1);
+
+ run_hooks(scan => sub {
+ shift->(
+ page => $page,
+ content => $content,
+ );
+ });
+
push @internal_changed, $file;
}
else {
push @internal_changed, $file;
}
else {
@@
-527,7
+538,7
@@
sub remove_unrendered () {
foreach my $file (@{$oldrenderedfiles{$page}}) {
if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
foreach my $file (@{$oldrenderedfiles{$page}}) {
if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
- prune($config{destdir}."/".$file);
+ prune($config{destdir}."/".$file
, $config{destdir}
);
}
}
}
}
}
}
@@
-790,6
+801,14
@@
sub refresh () {
derender_internal($file);
}
derender_internal($file);
}
+ run_hooks(build_affected => sub {
+ my %affected = shift->();
+ while (my ($page, $message) = each %affected) {
+ next unless exists $pagesources{$page};
+ render($pagesources{$page}, $message);
+ }
+ });
+
my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
$del, $oldlink_targets);
my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
$del, $oldlink_targets);
@@
-811,8
+830,13
@@
sub refresh () {
run_hooks(delete => sub { shift->(@$del, @$internal_del) });
}
if (%rendered) {
run_hooks(delete => sub { shift->(@$del, @$internal_del) });
}
if (%rendered) {
- run_hooks(change => sub { shift->(keys %rendered) });
+ run_hooks(rendered => sub { shift->(keys %rendered) });
+ run_hooks(change => sub { shift->(keys %rendered) }); # back-compat
}
}
+ my %all_changed = map { $_ => 1 }
+ @$new, @$changed, @$del,
+ @$internal_new, @$internal_changed, @$internal_del;
+ run_hooks(changes => sub { shift->(keys %all_changed) });
}
sub clean_rendered {
}
sub clean_rendered {
@@
-821,7
+845,7
@@
sub clean_rendered {
remove_unrendered();
foreach my $page (keys %oldrenderedfiles) {
foreach my $file (@{$oldrenderedfiles{$page}}) {
remove_unrendered();
foreach my $page (keys %oldrenderedfiles) {
foreach my $file (@{$oldrenderedfiles{$page}}) {
- prune($config{destdir}."/".$file);
+ prune($config{destdir}."/".$file
, $config{destdir}
);
}
}
}
}
}
}