my @links;
foreach my $p (backlink_pages($page)) {
my $href=urlto($p, $page);
-
+
# Trim common dir prefixes from both pages.
my $p_trimmed=$p;
my $page_trimmed=$page;
}
sub verify_src_file ($$) {
- my $file=decode_utf8(shift);
+ my $file=shift;
my $dir=shift;
return if -l $file || -d _;
my $page = pagename($file);
if (! exists $pagesources{$page} &&
file_pruned($file)) {
- $File::Find::prune=1;
return;
}
find({
no_chdir => 1,
wanted => sub {
- my ($file, $page) = verify_src_file($_, $config{srcdir});
+ my ($file, $page) = verify_src_file(decode_utf8($_), $config{srcdir});
if (defined $file) {
push @files, $file;
if ($pages{$page}) {
}
$pages{$page}=1;
}
+ else {
+ $File::Find::prune=1;
+ }
},
}, $config{srcdir});
foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
find({
no_chdir => 1,
wanted => sub {
- my ($file, $page) = verify_src_file($_, $dir);
+ my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
if (defined $file) {
# avoid underlaydir override
# attacks; see security.mdwn
}
}
}
+ else {
+ $File::Find::prune=1;
+ }
},
}, $dir);
};
push @internal_new, $file;
}
elsif ($config{rcs}) {
- if (! $times_noted) {
- debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
- $times_noted=1;
- }
-
push @new, $file;
if ($config{gettime} && -e "$config{srcdir}/$file") {
+ if (! $times_noted) {
+ debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+ $times_noted=1;
+ }
+
eval {
my $ctime=rcs_getctime("$config{srcdir}/$file");
if ($ctime > 0) {
foreach my $file (@_) {
my $page=pagename($file);
if (! isinternal($page)) {
- debug(sprintf(gettext("removing old page %s"), $page));
+ debug(sprintf(gettext("removing obsolete %s"), $page));
}
foreach my $old (@{$oldrenderedfiles{$page}}) {
if ($type == $IkiWiki::DEPEND_LINKS) {
next unless $linkchangers->{lc($page)};
}
- return $page;
+ $reason=$page;
+ return 1;
}
}
return undef;
};
if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
- last if $reason =
- $in->(\@changed, $IkiWiki::DEPEND_CONTENT);
- last if $internal_dep && ($reason =
+ last if $in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+ last if $internal_dep && (
$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
$in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
- $in->($internal_changed, $IkiWiki::DEPEND_CONTENT));
+ $in->($internal_changed, $IkiWiki::DEPEND_CONTENT)
+ );
}
if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
- last if $reason =
- $in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
- last if $internal_dep && ($reason =
+ last if $in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+ last if $internal_dep && (
$in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
- $in->($internal_del, $IkiWiki::DEPEND_PRESENCE));
+ $in->($internal_del, $IkiWiki::DEPEND_PRESENCE)
+ );
}
if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
- last if $reason =
- $in->(\@changed, $IkiWiki::DEPEND_LINKS);
- last if $internal_dep && ($reason =
+ last if $in->(\@changed, $IkiWiki::DEPEND_LINKS);
+ last if $internal_dep && (
$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
- $in->($internal_changed, $IkiWiki::DEPEND_LINKS));
+ $in->($internal_changed, $IkiWiki::DEPEND_LINKS)
+ );
}
}
}
}
}
+sub gen_autofile ($$$) {
+ my $autofile=shift;
+ my $pages=shift;
+ my $del=shift;
+
+ if (srcfile($autofile, 1)) {
+ return 0;
+ }
+
+ my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+
+ if ((!defined $file) ||
+ (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+ return 0;
+ }
+
+ if ($pages->{$page}) {
+ return 0;
+ }
+
+ if (grep { $_ eq $file } @$del) {
+ $wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
+ return 0;
+ }
+
+ $autofiles{$autofile}{generator}->();
+ $pages->{$page}=1;
+ return 1;
+}
+
+
sub refresh () {
srcdir_check();
run_hooks(refresh => sub { shift->() });
my ($changed, $internal_changed)=find_changed($files);
run_hooks(needsbuild => sub { shift->($changed) });
my $oldlink_targets=calculate_old_links($changed, $del);
- %del_hash = map { $_ => 1 } @{$del};
foreach my $file (@$changed) {
scan($file);
}
- while (my $autofile = shift @{[keys %autofiles]}) {
- my $plugin=$autofiles{$autofile};
- my $page=pagename($autofile);
- if ($pages->{$page}) {
- debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+ foreach my $autofile (keys %autofiles) {
+ if (gen_autofile($autofile, $pages, $del)) {
+ push @{$files}, $autofile;
+ push @{$new}, $autofile if find_new_files([$autofile]);
+ push @{$changed}, $autofile if find_changed([$autofile]);
+
+ scan($autofile);
}
- $pages->{$page}=1;
-
- push @{$files}, $autofile;
- push @{$new}, $autofile if find_new_files([$autofile]);
- push @{$changed}, $autofile if find_changed([$autofile]);
-
- scan($autofile);
- delete $autofiles{$autofile};
}
calculate_links();