projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d56f17
)
split two helper functions of of render()
author
Joey Hess
<joey@gnu.kitenet.net>
Mon, 20 Jul 2009 03:23:16 +0000
(
05:23
+0200)
committer
Joey Hess
<joey@gnu.kitenet.net>
Mon, 20 Jul 2009 03:23:16 +0000
(
05:23
+0200)
IkiWiki/Render.pm
patch
|
blob
|
history
diff --git
a/IkiWiki/Render.pm
b/IkiWiki/Render.pm
index 2da18738d9e4f2740dadb22f647383846f4c3742..59cec364638eaed3b8a7fb5e5bdbe18d3b3c4847 100644
(file)
--- a/
IkiWiki/Render.pm
+++ b/
IkiWiki/Render.pm
@@
-246,7
+246,7
@@
sub prune ($) {
}
}
}
}
-sub
refresh
() {
+sub
srcdir_check
() {
# security check, avoid following symlinks in the srcdir path by default
my $test=$config{srcdir};
while (length $test) {
# security check, avoid following symlinks in the srcdir path by default
my $test=$config{srcdir};
while (length $test) {
@@
-258,11
+258,10
@@
sub refresh () {
}
}
}
}
- run_hooks(refresh => sub { shift->() });
+}
- # find existing pages
- my %exists;
- my @files;
+sub find_src_files () {
+ my (@files, %pages);
eval q{use File::Find};
error($@) if $@;
find({
eval q{use File::Find};
error($@) if $@;
find({
@@
-281,10
+280,10
@@
sub refresh () {
$f=~s/^\Q$config{srcdir}\E\/?//;
push @files, $f;
my $pagename = pagename($f);
$f=~s/^\Q$config{srcdir}\E\/?//;
push @files, $f;
my $pagename = pagename($f);
- if ($
exist
s{$pagename}) {
+ if ($
page
s{$pagename}) {
debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
}
debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
}
- $
exist
s{$pagename}=1;
+ $
page
s{$pagename}=1;
}
}
},
}
}
},
@@
-310,9
+309,9
@@
sub refresh () {
if (! -l "$config{srcdir}/$f" &&
! -e _) {
my $page=pagename($f);
if (! -l "$config{srcdir}/$f" &&
! -e _) {
my $page=pagename($f);
- if (! $
exist
s{$page}) {
+ if (! $
page
s{$page}) {
push @files, $f;
push @files, $f;
- $
exist
s{$page}=1;
+ $
page
s{$page}=1;
}
}
}
}
}
}
@@
-321,9
+320,19
@@
sub refresh () {
}, $dir);
};
}, $dir);
};
+ # Returns a list of all source files found, and a hash of
+ # the corresponding page names.
+ return \@files, \%pages;
+}
+
+sub refresh () {
+ srcdir_check();
+ run_hooks(refresh => sub { shift->() });
+ my ($files, $exists)=find_src_files();
+
my (%rendered, @add, @del, @internal);
# check for added or removed pages
my (%rendered, @add, @del, @internal);
# check for added or removed pages
- foreach my $file (@files) {
+ foreach my $file (@
$
files) {
my $page=pagename($file);
if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
# the page has changed its type
my $page=pagename($file);
if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
# the page has changed its type
@@
-353,7
+362,7
@@
sub refresh () {
}
}
foreach my $page (keys %pagemtime) {
}
}
foreach my $page (keys %pagemtime) {
- if (! $exists{$page}) {
+ if (! $exists
->
{$page}) {
if (isinternal($page)) {
push @internal, $pagesources{$page};
}
if (isinternal($page)) {
push @internal, $pagesources{$page};
}
@@
-377,7
+386,7
@@
sub refresh () {
# find changed and new files
my @needsbuild;
# find changed and new files
my @needsbuild;
- foreach my $file (@files) {
+ foreach my $file (@
$
files) {
my $page=pagename($file);
my ($srcfile, @stat)=srcfile_stat($file);
if (! exists $pagemtime{$page} ||
my $page=pagename($file);
my ($srcfile, @stat)=srcfile_stat($file);
if (! exists $pagemtime{$page} ||
@@
-435,7
+444,7
@@
sub refresh () {
my @changed=(keys %rendered, @del);
# rebuild dependant pages
my @changed=(keys %rendered, @del);
# rebuild dependant pages
- foreach my $f (@files) {
+ foreach my $f (@
$
files) {
next if $rendered{$f};
my $p=pagename($f);
if (exists $depends{$p}) {
next if $rendered{$f};
my $p=pagename($f);
if (exists $depends{$p}) {