don't check $@ after pagespec_translate

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0fe20c64f3a0939d7dde93107e7b0285e883e2a2..abafb0887f32b0a6fcc25115b6ecb6be63bc4d6a 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -61,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;

+       
+       run_hooks(postscan => sub {
+               shift->(page => $page, content => $content);
+       });

 
        my $templatefile;
        run_hooks(templatefile => sub {
 
        my $templatefile;
        run_hooks(templatefile => sub {


@@ -74,11 +78,14 @@ sub genpage ($$) {
        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {

-               $template->param(editurl => cgiurl(do => "edit", page => $page))
-                       if IkiWiki->can("cgi_editpage");
-               $template->param(prefsurl => cgiurl(do => "prefs"))
-                       if exists $hooks{auth};
-               $actions++;
+               if (IkiWiki->can("cgi_editpage")) {
+                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                       $actions++;
+               }
+               if (exists $hooks{auth}) {
+                       $template->param(prefsurl => cgiurl(do => "prefs"));
+                       $actions++;
+               }

        }
                
        if (defined $config{historyurl} && length $config{historyurl}) {
        }
                
        if (defined $config{historyurl} && length $config{historyurl}) {


@@ -88,7 +95,7 @@ sub genpage ($$) {
                $actions++;
        }
        if ($config{discussion}) {
                $actions++;
        }
        if ($config{discussion}) {

-               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&

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


@@ -130,10 +137,6 @@ sub genpage ($$) {
        
        $content=$template->output;
        
        
        $content=$template->output;
        

-       run_hooks(postscan => sub {
-               shift->(page => $page, content => $content);
-       });
-

        run_hooks(format => sub {
                $content=shift->(
                        page => $page,
        run_hooks(format => sub {
                $content=shift->(
                        page => $page,


@@ -287,13 +290,13 @@ sub find_src_files () {
                wanted => sub {
                        my $file=decode_utf8($_);
                        $file=~s/^\Q$config{srcdir}\E\/?//;
                wanted => sub {
                        my $file=decode_utf8($_);
                        $file=~s/^\Q$config{srcdir}\E\/?//;

+                       return if -l $_ || -d _ || ! length $file;

                        my $page = pagename($file);
                        if (! exists $pagesources{$page} &&
                            file_pruned($file)) {
                                $File::Find::prune=1;
                                return;
                        }
                        my $page = pagename($file);
                        if (! exists $pagesources{$page} &&
                            file_pruned($file)) {
                                $File::Find::prune=1;
                                return;
                        }

-                       return if -l $_ || -d _ || ! length $file;

 
                        my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
                        if (! defined $f) {
 
                        my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
                        if (! defined $f) {


@@ -314,13 +317,13 @@ sub find_src_files () {
                        wanted => sub {
                                my $file=decode_utf8($_);
                                $file=~s/^\Q$dir\E\/?//;
                        wanted => sub {
                                my $file=decode_utf8($_);
                                $file=~s/^\Q$dir\E\/?//;

+                               return if -l $_ || -d _ || ! length $file;

                                my $page=pagename($file);
                                if (! exists $pagesources{$page} &&
                                    file_pruned($file)) {
                                        $File::Find::prune=1;
                                        return;
                                }
                                my $page=pagename($file);
                                if (! exists $pagesources{$page} &&
                                    file_pruned($file)) {
                                        $File::Find::prune=1;
                                        return;
                                }

-                               return if -l $_ || -d _ || ! length $file;

 
                                my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
 
                                my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {


@@ -392,27 +395,39 @@ sub find_del_files ($) {
                                push @internal_del, $pagesources{$page};
                        }
                        else {
                                push @internal_del, $pagesources{$page};
                        }
                        else {

-                               debug(sprintf(gettext("removing old page %s"), $page));

                                push @del, $pagesources{$page};
                        }
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;
                                push @del, $pagesources{$page};
                        }
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;

-                       foreach my $old (@{$oldrenderedfiles{$page}}) {
-                               prune($config{destdir}."/".$old);
-                       }
-                       delete $pagesources{$page};
-                       foreach my $source (keys %destsources) {
-                               if ($destsources{$source} eq $page) {
-                                       delete $destsources{$source};
-                               }
-                       }

                }
        }
 
        return \@del, \@internal_del;
 }
 
                }
        }
 
        return \@del, \@internal_del;
 }
 

+sub remove_del (@) {
+       foreach my $file (@_) {
+               my $page=pagename($file);
+               if (! isinternal($page)) {
+                       debug(sprintf(gettext("removing old page %s"), $page));
+               }
+       
+               foreach my $old (@{$oldrenderedfiles{$page}}) {
+                       prune($config{destdir}."/".$old);
+               }
+
+               foreach my $source (keys %destsources) {
+                       if ($destsources{$source} eq $page) {
+                               delete $destsources{$source};
+                       }
+               }
+       
+               delete $pagecase{lc $page};
+               delete $pagesources{$page};
+       }
+}
+

 sub find_changed ($) {
        my $files=shift;
        my @changed;
 sub find_changed ($) {
        my $files=shift;
        my @changed;


@@ -550,7 +565,7 @@ sub render_dependent ($$$$$$$) {
                if (exists $depends{$p} && ! defined $reason) {
                        foreach my $dep (keys %{$depends{$p}}) {
                                my $sub=pagespec_translate($dep);
                if (exists $depends{$p} && ! defined $reason) {
                        foreach my $dep (keys %{$depends{$p}}) {
                                my $sub=pagespec_translate($dep);

-                               next if $@ || ! defined $sub;
+                               next unless defined $sub;

 
                                # only consider internal files
                                # if the page explicitly depends
 
                                # only consider internal files
                                # if the page explicitly depends


@@ -633,6 +648,8 @@ sub refresh () {
        }
 
        calculate_links();
        }
 
        calculate_links();

+       
+       remove_del(@$del, @$internal_del);

 
        foreach my $file (@$changed) {
                render($file, sprintf(gettext("building %s"), $file));
 
        foreach my $file (@$changed) {
                render($file, sprintf(gettext("building %s"), $file));


@@ -666,6 +683,17 @@ sub refresh () {
        }
 }
 
        }
 }
 

+sub clean_rendered {
+       lockwiki();
+       loadindex();
+       remove_unrendered();
+       foreach my $page (keys %oldrenderedfiles) {
+               foreach my $file (@{$oldrenderedfiles{$page}}) {
+                       prune($config{destdir}."/".$file);
+               }
+       }
+}
+

 sub commandline_render () {
        lockwiki();
        loadindex();
 sub commandline_render () {
        lockwiki();
        loadindex();