urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoindex: Avoid re-adding previously deleted (or renamed) pages.

master
Joey Hess 2008-08-26 14:38:32 -04:00
parent dbf82a1c44
commit a326ffed1f
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IkiWiki/Plugin/autoindex.pm
View File

@ -59,11 +59,37 @@ sub refresh () { #{{{
}
}, $dir);
}
my %deleted;
if (ref $pagestate{index}{autoindex}{deleted}) {
%deleted=%{$pagestate{index}{autoindex}{deleted}};
foreach my $dir (keys %deleted) {
# remove deleted page state if the deleted page is re-added,
# or if all its subpages are deleted
if ($deleted{$dir} && (exists $pages{$dir} ||
! grep /^$dir\/.*/, keys %pages)) {
delete $deleted{$dir};
}
}
$pagestate{index}{autoindex}{deleted}=\%deleted;
}
my @needed;
foreach my $dir (keys %dirs) {
if (! exists $pages{$dir} && grep /^$dir\/.*/, keys %pages) {
push @needed, $dir;
if (! exists $pages{$dir} && ! $deleted{$dir} &&
grep /^$dir\/.*/, keys %pages) {
if (exists $IkiWiki::pagemtime{$dir}) {
# This page must have just been deleted, so
# don't re-add it. And remember it was
# deleted.
if (! ref $pagestate{index}{autoindex}{deleted}) {
$pagestate{index}{autoindex}{deleted}={};
}
${$pagestate{index}{autoindex}{deleted}}{$dir}=1;
}
else {
push @needed, $dir;
}
}
}

1
debian/changelog vendored
View File

@ -18,6 +18,7 @@ ikiwiki (2.62) UNRELEASED; urgency=low
originally part of the attachment plugin.
* edittemplate: Don't wipe out edits on preview.
* color: New plugin from ptecza.
* autoindex: Avoid re-adding previously deleted (or renamed) pages.
-- Joey Hess <joeyh@debian.org> Thu, 21 Aug 2008 16:20:58 -0400