]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Render.pm
unfuzzy
[git.ikiwiki.info.git] / IkiWiki / Render.pm
index f59e54f2934a2c459660eada83b11dff925cd573..7ca9a38208aef4d141f629943ce32d10f388ee20 100644 (file)
@@ -11,6 +11,7 @@ my %backlinks;
 my $backlinks_calculated=0;
 
 sub calculate_backlinks () { #{{{
+       return if $backlinks_calculated;
        %backlinks=();
        foreach my $page (keys %links) {
                foreach my $link (@{$links{$page}}) {
@@ -26,7 +27,7 @@ sub calculate_backlinks () { #{{{
 sub backlinks ($) { #{{{
        my $page=shift;
 
-       calculate_backlinks() unless $backlinks_calculated;
+       calculate_backlinks();
 
        my @links;
        return unless $backlinks{$page};
@@ -92,8 +93,9 @@ sub genpage ($$$) { #{{{
                $template->param(historyurl => $u);
                $actions++;
        }
-       if ($config{discussion}) {
-               $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+       if ($config{discussion} && $page !~ /.*\/discussion$/ &&
+           (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
+               $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));
                $actions++;
        }
 
@@ -154,9 +156,9 @@ sub scan ($) { #{{{
                        push @links, titlepage($2);
                }
                if ($config{discussion}) {
-                       # Discussion links are a special case since they're not in the
-                       # text of the page, but on its template.
-                       push @links, "$page/discussion";
+                       # Discussion links are a special case since they're
+                       # not in the text of the page, but on its template.
+                       push @links, $page."/".gettext("discussion");
                }
                $links{$page}=\@links;
                
@@ -212,17 +214,18 @@ sub refresh () { #{{{
        my %exists;
        my @files;
        eval q{use File::Find};
+       error($@) if $@;
        find({
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);
-                       if (/$config{wiki_file_prune_regexp}/) {
+                       if (file_pruned($_, $config{srcdir})) {
                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
-                                       warn("skipping bad filename $_\n");
+                                       warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
                                }
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
@@ -236,22 +239,25 @@ sub refresh () { #{{{
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);
-                       if (/$config{wiki_file_prune_regexp}/) {
+                       if (file_pruned($_, $config{underlaydir})) {
                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
-                                       warn("skipping bad filename $_\n");
+                                       warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
                                }
                                else {
-                                       # Don't add files that are in the
+                                       # Don't add pages that are in the
                                        # srcdir.
                                        $f=~s/^\Q$config{underlaydir}\E\/?//;
                                        if (! -e "$config{srcdir}/$f" && 
                                            ! -l "$config{srcdir}/$f") {
-                                               push @files, $f;
-                                               $exists{pagename($f)}=1;
+                                               my $page=pagename($f);
+                                               if (! $exists{$page}) {
+                                                       push @files, $f;
+                                                       $exists{$page}=1;
+                                               }
                                        }
                                }
                        }
@@ -264,10 +270,10 @@ sub refresh () { #{{{
        my @add;
        foreach my $file (@files) {
                my $page=pagename($file);
+               $pagesources{$page}=$file;
                if (! $oldpagemtime{$page}) {
                        push @add, $file;
                        $pagecase{lc $page}=$page;
-                       $pagesources{$page}=$file;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
                        }
@@ -279,7 +285,7 @@ sub refresh () { #{{{
        my @del;
        foreach my $page (keys %oldpagemtime) {
                if (! $exists{$page}) {
-                       debug("removing old page $page");
+                       debug(sprintf(gettext("removing old page %s"), $page));
                        push @del, $pagesources{$page};
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
@@ -298,35 +304,30 @@ sub refresh () { #{{{
                if (! exists $oldpagemtime{$page} ||
                    mtime(srcfile($file)) > $oldpagemtime{$page} ||
                    $forcerebuild{$page}) {
-                       debug("scanning $file");
+                       debug(sprintf(gettext("scanning %s"), $file));
                        push @changed, $file;
                        scan($file);
                }
        }
+       calculate_backlinks();
 
        # render changed and new pages
        foreach my $file (@changed) {
-               debug("rendering $file");
+               debug(sprintf(gettext("rendering %s"), $file));
                render($file);
                $rendered{$file}=1;
        }
        
-       # if any files were added or removed, check to see if each page
-       # needs an update due to linking to them or inlining them
+       # rebuild pages that link to added or removed pages
        if (@add || @del) {
-FILE:          foreach my $file (@files) {
-                       next if $rendered{$file};
-                       my $page=pagename($file);
-                       foreach my $f (@add, @del) {
-                               my $p=pagename($f);
-                               foreach my $link (@{$links{$page}}) {
-                                       if (bestlink($page, $link) eq $p) {
-                                               debug("rendering $file, which links to $p");
-                                               render($file);
-                                               $rendered{$file}=1;
-                                               next FILE;
-                                       }
-                               }
+               foreach my $f (@add, @del) {
+                       my $p=pagename($f);
+                       foreach my $page (keys %{$backlinks{$p}}) {
+                               my $file=$pagesources{$page};
+                               next if $rendered{$file};
+                               debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p));
+                               render($file);
+                               $rendered{$file}=1;
                        }
                }
        }
@@ -341,7 +342,7 @@ FILE:               foreach my $file (@files) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p})) {
-                                               debug("rendering $f, which depends on $page");
+                                               debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;
                                                last;
@@ -379,7 +380,7 @@ FILE:               foreach my $file (@files) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                                next if $rendered{$linkfile};
-                               debug("rendering $linkfile, to update its backlinks");
+                               debug(sprintf(gettext("rendering %s, to update its backlinks"), $linkfile));
                                render($linkfile);
                                $rendered{$linkfile}=1;
                        }
@@ -391,7 +392,7 @@ FILE:               foreach my $file (@files) {
                my $page=pagename($src);
                foreach my $file (@{$oldrenderedfiles{$page}}) {
                        if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
-                               debug("removing $file, no longer rendered by $page");
+                               debug(sprintf(gettext("removing %s, no longer rendered by %s"), $file, $page));
                                prune($config{destdir}."/".$file);
                        }
                }
@@ -417,7 +418,7 @@ sub commandline_render () { #{{{
        $file=~s/\Q$config{srcdir}\E\/?//;
 
        my $type=pagetype($file);
-       die "ikiwiki: cannot render $srcfile\n" unless defined $type;
+       die sprintf(gettext("ikiwiki: cannot render %s"), $srcfile)."\n" unless defined $type;
        my $content=readfile($srcfile);
        my $page=pagename($file);
        $pagesources{$page}=$file;