respond

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8e4c8af71f8a2df4c0f59f0971309f76b040cd69..578142d2e8eddb5b41dd08ce13a1e65b54ddf1c6 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,30 +7,41 @@ use strict;
 use IkiWiki;
 use Encode;
 
 use IkiWiki;
 use Encode;
 

-our %backlinks=();
-our $backlinks_calculated=0;
+my %backlinks;
+our %brokenlinks;
+my $links_calculated=0;

 
 

-sub calculate_backlinks () {
-       return if $backlinks_calculated;
-       %backlinks=();
+sub calculate_links () {
+       return if $links_calculated;
+       %backlinks=%brokenlinks=();

        foreach my $page (keys %links) {
                foreach my $link (@{$links{$page}}) {
                        my $bestlink=bestlink($page, $link);
        foreach my $page (keys %links) {
                foreach my $link (@{$links{$page}}) {
                        my $bestlink=bestlink($page, $link);

-                       if (length $bestlink && $bestlink ne $page) {
-                               $backlinks{$bestlink}{$page}=1;
+                       if (length $bestlink) {
+                               $backlinks{$bestlink}{$page}=1
+                                       if $bestlink ne $page;
+                       }
+                       else {
+                               push @{$brokenlinks{$link}}, $page;

                        }
                }
        }
                        }
                }
        }

-       $backlinks_calculated=1;
+       $links_calculated=1;

 }
 
 }
 

-sub backlinks ($) {
+sub backlink_pages ($) {

        my $page=shift;
 
        my $page=shift;
 

-       calculate_backlinks();
+       calculate_links();
+
+       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 +76,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,11 +88,10 @@ sub genpage ($$) {
                $actions++;
        }
        if ($config{discussion}) {
                $actions++;
        }
        if ($config{discussion}) {

-               my $discussionlink=gettext("discussion");
-               if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&

                   (length $config{cgiurl} ||
                   (length $config{cgiurl} ||

-                   exists $links{$page."/".$discussionlink})) {
-                       $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
+                   exists $links{$page."/".$config{discussionpage}})) {
+                       $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));

                        $actions++;
                }
        }
                        $actions++;
                }
        }


@@ -146,7 +157,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($config{discussionpage}) ];

                }
                else {
                        $links{$page}=[];
                }
                else {
                        $links{$page}=[];


@@ -245,7 +256,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 +268,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 +290,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 ($exists{$pagename}) {
+                                       if ($pages{$pagename}) {

                                                debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
                                        }
                                                debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
                                        }

-                                       $exists{$pagename}=1;
+                                       $pages{$pagename}=1;

                                }
                        }
                },
                                }
                        }
                },


@@ -309,9 +319,9 @@ sub refresh () {
                                                if (! -l "$config{srcdir}/$f" && 
                                                    ! -e _) {
                                                        my $page=pagename($f);
                                                if (! -l "$config{srcdir}/$f" && 
                                                    ! -e _) {
                                                        my $page=pagename($f);

-                                                       if (! $exists{$page}) {
+                                                       if (! $pages{$page}) {

                                                                push @files, $f;
                                                                push @files, $f;

-                                                               $exists{$page}=1;
+                                                               $pages{$page}=1;

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }


@@ -320,9 +330,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 +372,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 +383,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 +397,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} ||


@@ -400,9 +421,9 @@ sub refresh () {
                debug(sprintf(gettext("scanning %s"), $file));
                scan($file);
        }
                debug(sprintf(gettext("scanning %s"), $file));
                scan($file);
        }

-       calculate_backlinks();
+       calculate_links();

        foreach my $file (@needsbuild) {
        foreach my $file (@needsbuild) {

-               debug(sprintf(gettext("rendering %s"), $file));
+               debug(sprintf(gettext("building %s"), $file));

                render($file);
                $rendered{$file}=1;
        }
                render($file);
                $rendered{$file}=1;
        }


@@ -423,7 +444,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("rendering %s, which links to %s"), $file, $p));
+                               debug(sprintf(gettext("building %s, which links to %s"), $file, $p));

                                render($file);
                                $rendered{$file}=1;
                        }
                                render($file);
                                $rendered{$file}=1;
                        }


@@ -434,7 +455,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 +465,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("rendering %s, which depends on %s"), $f, $page));
+                                               debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));

                                                render($f);
                                                $rendered{$f}=1;
                                                last;
                                                render($f);
                                                $rendered{$f}=1;
                                                last;


@@ -483,7 +504,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("rendering %s, to update its backlinks"), $linkfile));
+                               debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile));

                                render($linkfile);
                                $rendered{$linkfile}=1;
                        }
                                render($linkfile);
                                $rendered{$linkfile}=1;
                        }


@@ -495,7 +516,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);
                        }
                }


@@ -519,7 +540,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;