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
Only examine argv if the VCS is cvs.
[git.ikiwiki.info.git]
/
IkiWiki
/
Render.pm
diff --git
a/IkiWiki/Render.pm
b/IkiWiki/Render.pm
index 0ce972ac7883856992878df1d4d247b02feacd71..74033fa974165444359c811d4f2a1c90dd46a26d 100644
(file)
--- a/
IkiWiki/Render.pm
+++ b/
IkiWiki/Render.pm
@@
-7,7
+7,7
@@
use strict;
use IkiWiki;
use Encode;
use IkiWiki;
use Encode;
-
our %backlinks=()
;
+
my %backlinks
;
my $backlinks_calculated=0;
sub calculate_backlinks () {
my $backlinks_calculated=0;
sub calculate_backlinks () {
@@
-24,13
+24,19
@@
sub calculate_backlinks () {
$backlinks_calculated=1;
}
$backlinks_calculated=1;
}
-sub backlinks ($) {
+sub backlink
_page
s ($) {
my $page=shift;
calculate_backlinks();
my $page=shift;
calculate_backlinks();
+ return keys %{$backlinks{$page}};
+}
+
+sub backlinks ($) {
+ my $page=shift;
+
my @links;
my @links;
- foreach my $p (
keys %{$backlinks{$page}}
) {
+ foreach my $p (
backlink_pages($page)
) {
my $href=urlto($p, $page);
# Trim common dir prefixes from both pages.
my $href=urlto($p, $page);
# Trim common dir prefixes from both pages.
@@
-65,7
+71,8
@@
sub genpage ($$) {
if (length $config{cgiurl}) {
$template->param(editurl => cgiurl(do => "edit", page => $page))
if IkiWiki->can("cgi_editpage");
if (length $config{cgiurl}) {
$template->param(editurl => cgiurl(do => "edit", page => $page))
if IkiWiki->can("cgi_editpage");
- $template->param(prefsurl => cgiurl(do => "prefs"));
+ $template->param(prefsurl => cgiurl(do => "prefs"))
+ if exists $hooks{auth};
$actions++;
}
$actions++;
}
@@
-76,7
+83,7
@@
sub genpage ($$) {
$actions++;
}
if ($config{discussion}) {
$actions++;
}
if ($config{discussion}) {
- my $discussionlink=
gettext("discussion"
);
+ my $discussionlink=
lc(gettext("Discussion")
);
if ($page !~ /.*\/\Q$discussionlink\E$/ &&
(length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) {
if ($page !~ /.*\/\Q$discussionlink\E$/ &&
(length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) {
@@
-146,7
+153,7
@@
sub scan ($) {
if ($config{discussion}) {
# Discussion links are a special case since they're
# not in the text of the page, but on its template.
if ($config{discussion}) {
# Discussion links are a special case since they're
# not in the text of the page, but on its template.
- $links{$page}=[ $page."/".
gettext("discussion"
) ];
+ $links{$page}=[ $page."/".
lc(gettext("Discussion")
) ];
}
else {
$links{$page}=[];
}
else {
$links{$page}=[];
@@
-245,7
+252,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) {
@@
-257,11
+264,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({
@@
-280,10
+286,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;
}
}
},
}
}
},
@@
-309,9
+315,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;
}
}
}
}
}
}
@@
-320,9
+326,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
@@
-352,7
+368,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};
}
@@
-363,12
+379,13
@@
sub refresh () {
$links{$page}=[];
$renderedfiles{$page}=[];
$pagemtime{$page}=0;
$links{$page}=[];
$renderedfiles{$page}=[];
$pagemtime{$page}=0;
- prune($config{destdir}."/".$_)
- foreach @{$oldrenderedfiles{$page}};
+ foreach my $old (@{$oldrenderedfiles{$page}}) {
+ prune($config{destdir}."/".$old);
+ }
delete $pagesources{$page};
delete $pagesources{$page};
- foreach (keys %destsources) {
- if ($destsources{$
_
} eq $page) {
- delete $destsources{$
_
};
+ foreach
my $source
(keys %destsources) {
+ if ($destsources{$
source
} eq $page) {
+ delete $destsources{$
source
};
}
}
}
}
}
}
@@
-376,7
+393,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} ||
@@
-402,7
+419,7
@@
sub refresh () {
}
calculate_backlinks();
foreach my $file (@needsbuild) {
}
calculate_backlinks();
foreach my $file (@needsbuild) {
- debug(sprintf(gettext("
render
ing %s"), $file));
+ debug(sprintf(gettext("
build
ing %s"), $file));
render($file);
$rendered{$file}=1;
}
render($file);
$rendered{$file}=1;
}
@@
-423,7
+440,7
@@
sub refresh () {
foreach my $page (keys %{$backlinks{$p}}) {
my $file=$pagesources{$page};
next if $rendered{$file};
foreach my $page (keys %{$backlinks{$p}}) {
my $file=$pagesources{$page};
next if $rendered{$file};
- debug(sprintf(gettext("
render
ing %s, which links to %s"), $file, $p));
+ debug(sprintf(gettext("
build
ing %s, which links to %s"), $file, $p));
render($file);
$rendered{$file}=1;
}
render($file);
$rendered{$file}=1;
}
@@
-434,7
+451,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}) {
@@
-444,7
+461,7
@@
sub refresh () {
next if $f eq $file;
my $page=pagename($file);
if (pagespec_match($page, $depends{$p}, location => $p)) {
next if $f eq $file;
my $page=pagename($file);
if (pagespec_match($page, $depends{$p}, location => $p)) {
- debug(sprintf(gettext("
render
ing %s, which depends on %s"), $f, $page));
+ debug(sprintf(gettext("
build
ing %s, which depends on %s"), $f, $page));
render($f);
$rendered{$f}=1;
last;
render($f);
$rendered{$f}=1;
last;
@@
-483,7
+500,7
@@
sub refresh () {
my $linkfile=$pagesources{$link};
if (defined $linkfile) {
next if $rendered{$linkfile};
my $linkfile=$pagesources{$link};
if (defined $linkfile) {
next if $rendered{$linkfile};
- debug(sprintf(gettext("
render
ing %s, to update its backlinks"), $linkfile));
+ debug(sprintf(gettext("
build
ing %s, to update its backlinks"), $linkfile));
render($linkfile);
$rendered{$linkfile}=1;
}
render($linkfile);
$rendered{$linkfile}=1;
}
@@
-495,7
+512,7
@@
sub refresh () {
my $page=pagename($src);
foreach my $file (@{$oldrenderedfiles{$page}}) {
if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
my $page=pagename($src);
foreach my $file (@{$oldrenderedfiles{$page}}) {
if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
- debug(sprintf(gettext("removing %s, no longer
rendered
by %s"), $file, $page));
+ debug(sprintf(gettext("removing %s, no longer
built
by %s"), $file, $page));
prune($config{destdir}."/".$file);
}
}
prune($config{destdir}."/".$file);
}
}
@@
-507,6
+524,7
@@
sub refresh () {
if (%rendered) {
run_hooks(change => sub { shift->(keys %rendered) });
}
if (%rendered) {
run_hooks(change => sub { shift->(keys %rendered) });
}
+ run_hooks(postrefresh => sub { shift->() });
}
sub commandline_render () {
}
sub commandline_render () {
@@
-519,7
+537,7
@@
sub commandline_render () {
$file=~s/\Q$config{srcdir}\E\/?//;
my $type=pagetype($file);
$file=~s/\Q$config{srcdir}\E\/?//;
my $type=pagetype($file);
- die sprintf(gettext("ikiwiki: cannot
render
%s"), $srcfile)."\n" unless defined $type;
+ die sprintf(gettext("ikiwiki: cannot
build
%s"), $srcfile)."\n" unless defined $type;
my $content=readfile($srcfile);
my $page=pagename($file);
$pagesources{$page}=$file;
my $content=readfile($srcfile);
my $page=pagename($file);
$pagesources{$page}=$file;