use warnings;
use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
use Encode;
-sub import { #{{{
+sub import {
hook(type => "getsetup", id => "autoindex", call => \&getsetup);
hook(type => "refresh", id => "autoindex", call => \&refresh);
-} # }}}
+}
-sub getsetup () { #{{{
+sub getsetup () {
return
plugin => {
safe => 1,
rebuild => 0,
},
-} #}}}
+}
-sub genindex ($) { #{{{
+sub genindex ($) {
my $page=shift;
- my $file=$page.".".$config{default_pageext};
+ my $file=newpagefile($page, $config{default_pageext});
my $template=template("autoindex.tmpl");
$template->param(page => $page);
writefile($file, $config{srcdir}, $template->output);
if ($config{rcs}) {
IkiWiki::rcs_add($file);
}
-} #}}}
+}
-sub refresh () { #{{{
+sub refresh () {
eval q{use File::Find};
error($@) if $@;
+ eval q{use Cwd};
+ error($@) if $@;
+ my $origdir=getcwd();
my (%pages, %dirs);
- find({
- no_chdir => 1,
- wanted => sub {
- $_=decode_utf8($_);
- if (IkiWiki::file_pruned($_, $config{srcdir})) {
- $File::Find::prune=1;
- }
- elsif (! -l $_) {
- my ($f)=/$config{wiki_file_regexp}/; # untaint
- return unless defined $f;
- $f=~s/^\Q$config{srcdir}\E\/?//;
- return unless length $f;
- if (! -d _) {
- $pages{pagename($f)}=1;
+ foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
+ chdir($dir) || next;
+
+ find({
+ no_chdir => 1,
+ wanted => sub {
+ my $file=decode_utf8($_);
+ $file=~s/^\.\/?//;
+ return unless length $file;
+ if (IkiWiki::file_pruned($file)) {
+ $File::Find::prune=1;
}
- else {
- $dirs{$f}=1;
+ elsif (! -l $_) {
+ my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+ return unless defined $f;
+ return if $f =~ /\._([^.]+)$/; # skip internal page
+ if (! -d _) {
+ $pages{pagename($f)}=1;
+ }
+ elsif ($dir eq $config{srcdir}) {
+ $dirs{$f}=1;
+ }
}
}
+ }, '.');
+
+ chdir($origdir) || die "chdir $origdir: $!";
+ }
+
+ my %deleted;
+ if (ref $wikistate{autoindex}{deleted}) {
+ %deleted=%{$wikistate{autoindex}{deleted}};
+ }
+ elsif (ref $pagestate{index}{autoindex}{deleted}) {
+ # compatability code
+ %deleted=%{$pagestate{index}{autoindex}{deleted}};
+ delete $pagestate{index}{autoindex};
+ }
+
+ if (keys %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};
+ }
}
- }, $config{srcdir});
+ $wikistate{autoindex}{deleted}=\%deleted;
+ }
my @needed;
foreach my $dir (keys %dirs) {
- if (! exists $pages{$dir}) {
- 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 $wikistate{autoindex}{deleted}) {
+ $wikistate{autoindex}{deleted}={};
+ }
+ ${$wikistate{autoindex}{deleted}}{$dir}=1;
+ }
+ else {
+ push @needed, $dir;
+ }
}
}
if ($config{rcs}) {
IkiWiki::disable_commit_hook();
}
- genindex($_) foreach @needed;
+ foreach my $page (@needed) {
+ genindex($page);
+ }
if ($config{rcs}) {
IkiWiki::rcs_commit_staged(
- gettext("automatic index generation"),
- undef, undef);
+ message => gettext("automatic index generation"),
+ );
IkiWiki::enable_commit_hook();
}
}
-} #}}}
+}
1