post for Don

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d4e498188aad43c37f05fd28a094a951758b0a14..c16877b3deb9117573962d7a061843ecf26e5067 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -4,49 +4,8 @@ package IkiWiki;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use File::Spec;

 use IkiWiki;
 use IkiWiki;

-
-sub linkify ($$$) { #{{{
-       my $lpage=shift;
-       my $page=shift;
-       my $content=shift;
-
-       $content =~ s{(\\?)$config{wiki_link_regexp}}{
-               $2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-                  : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
-       }eg;
-       
-       return $content;
-} #}}}
-
-sub htmlize ($$) { #{{{
-       my $type=shift;
-       my $content=shift;
-       
-       if (! $INC{"/usr/bin/markdown"}) {
-               no warnings 'once';
-               $blosxom::version="is a proper perl module too much to ask?";
-               use warnings 'all';
-               do "/usr/bin/markdown";
-               use Encode;
-       }
-       
-       if ($type eq '.mdwn') {
-               $content=Encode::decode_utf8(Markdown::Markdown(Encode::encode_utf8($content)));
-       }
-       else {
-               error("htmlization of $type not supported");
-       }
-
-       if (exists $hooks{sanitize}) {
-               foreach my $id (keys %{$hooks{sanitize}}) {
-                       $content=$hooks{sanitize}{$id}{call}->($content);
-               }
-       }
-       
-       return $content;
-} #}}}
+use Encode;

 
 sub backlinks ($) { #{{{
        my $page=shift;
 
 sub backlinks ($) { #{{{
        my $page=shift;


@@ -55,7 +14,7 @@ sub backlinks ($) { #{{{
        foreach my $p (keys %links) {
                next if bestlink($page, $p) eq $page;
                if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
        foreach my $p (keys %links) {
                next if bestlink($page, $p) eq $page;
                if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {

-                       my $href=File::Spec->abs2rel(htmlpage($p), dirname($page));
+                       my $href=abs2rel(htmlpage($p), dirname($page));

                        
                        # Trim common dir prefixes from both pages.
                        my $p_trimmed=$p;
                        
                        # Trim common dir prefixes from both pages.
                        my $p_trimmed=$p;


@@ -66,7 +25,7 @@ sub backlinks ($) { #{{{
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       

-                       push @links, { url => $href, page => $p_trimmed };
+                       push @links, { url => $href, page => pagetitle($p_trimmed) };

                }
        }
 
                }
        }
 


@@ -80,10 +39,11 @@ sub parentlinks ($) { #{{{
        my $pagelink="";
        my $path="";
        my $skip=1;
        my $pagelink="";
        my $path="";
        my $skip=1;

+       return if $page eq 'index'; # toplevel

        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";

-                       unshift @ret, { url => "$path$dir.html", page => $dir };
+                       unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };

                }
                else {
                        $skip=0;
                }
                else {
                        $skip=0;


@@ -93,81 +53,12 @@ sub parentlinks ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub preprocess ($$;$) { #{{{
-       my $page=shift;
-       my $content=shift;
-       my $onlystrip=shift || 0; # strip directives without processing
-
-       my $handle=sub {
-               my $escape=shift;
-               my $command=shift;
-               my $params=shift;
-               if (length $escape) {
-                       return "[[$command $params]]";
-               }
-               elsif ($onlystrip) {
-                       return "";
-               }
-               elsif (exists $hooks{preprocess}{$command}) {
-                       # Note: preserve order of params, some plugins may
-                       # consider it significant.
-                       my @params;
-                       while ($params =~ /(\w+)=\"?([^"]+)"?(\s+|$)/g) {
-                               push @params, $1, $2;
-                       }
-                       return $hooks{preprocess}{$command}{call}->(@params, page => $page);
-               }
-               else {
-                       return "[[$command not processed]]";
-               }
-       };
-       
-       $content =~ s{(\\?)$config{wiki_processor_regexp}}{$handle->($1, $2, $3)}eg;
-       return $content;
-} #}}}
-
-sub add_depends ($$) { #{{{
-       my $page=shift;
-       my $globlist=shift;
-       
-       if (! exists $depends{$page}) {
-               $depends{$page}=$globlist;
-       }
-       else {
-               $depends{$page}=globlist_merge($depends{$page}, $globlist);
-       }
-} # }}}
-
-sub globlist_merge ($$) { #{{{
-       my $a=shift;
-       my $b=shift;
-
-       my $ret="";
-       # Only add negated globs if they are not matched by the other globlist.
-       foreach my $i ((map { [ $a, $_ ] } split(" ", $b)), 
-                      (map { [ $b, $_ ] } split(" ", $a))) {
-               if ($i->[1]=~/^!(.*)/) {
-                       if (! globlist_match($1, $i->[0])) {
-                               $ret.=" ".$i->[1];
-                       }
-               }
-               else {
-                       $ret.=" ".$i->[1];
-               }
-       }
-       
-       return $ret;
-} #}}}
-

 sub genpage ($$$) { #{{{
        my $page=shift;
        my $content=shift;
        my $mtime=shift;
 
 sub genpage ($$$) { #{{{
        my $page=shift;
        my $content=shift;
        my $mtime=shift;
 

-       my $title=pagetitle(basename($page));
-       
-       my $template=HTML::Template->new(blind_cache => 1,
-               filename => "$config{templatedir}/page.tmpl");
+       my $template=template("page.tmpl", blind_cache => 1);

        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {


@@ -195,22 +86,31 @@ sub genpage ($$$) { #{{{
        }
 
        $template->param(
        }
 
        $template->param(

-               title => $title,
+               title => $page eq 'index' 
+                       ? $config{wikiname} 
+                       : pagetitle(basename($page)),

                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
                backlinks => [backlinks($page)],
                mtime => displaytime($mtime),
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
                backlinks => [backlinks($page)],
                mtime => displaytime($mtime),

-               styleurl => styleurl($page),
+               baseurl => baseurl($page),

        );
 
        );
 

-       if (exists $hooks{pagetemplate}) {
-               foreach my $id (keys %{$hooks{pagetemplate}}) {
-                       $hooks{pagetemplate}{$id}{call}->($page, $template);
-               }
-       }
+       run_hooks(pagetemplate => sub {
+               shift->(page => $page, destpage => $page, template => $template);
+       });

        
        

-       return $template->output;
+       $content=$template->output;
+
+       run_hooks(format => sub {
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );
+       });
+
+       return $content;

 } #}}}
 
 sub check_overwrite ($$) { #{{{
 } #}}}
 
 sub check_overwrite ($$) { #{{{


@@ -220,22 +120,7 @@ sub check_overwrite ($$) { #{{{
        my $src=shift;
        
        if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
        my $src=shift;
        
        if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {

-               error("$dest already exists and was rendered from ".
-                       join(" ",(grep { $renderedfiles{$_} eq $dest } keys
-                               %renderedfiles)).
-                       ", before, so not rendering from $src");
-       }
-} #}}}
-
-sub displaytime ($) { #{{{
-       my $time=shift;
-
-       if ($config{timeformat} eq '%c') {
-               return scalar(localtime($time)); # optimisation
-       }
-       else {
-               eval q{use POSIX};
-               return POSIX::strftime($config{timeformat}, localtime($time));
+               error("$dest already exists and was not rendered from $src before");

        }
 } #}}}
 
        }
 } #}}}
 


@@ -268,25 +153,18 @@ sub render ($) { #{{{
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);

-       if ($type ne 'unknown') {
+       if (defined $type) {

                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};
                
                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};
                

-               if (exists $hooks{filter}) {
-                       foreach my $id (keys %{$hooks{filter}}) {
-                               $content=$hooks{filter}{$id}{call}->(
-                                       page => $page,
-                                       content => $content
-                               );
-                       }
-               }
+               $content=filter($page, $content);

                
                $links{$page}=[findlinks($page, $content)];
                
                
                $links{$page}=[findlinks($page, $content)];
                

+               $content=preprocess($page, $page, $content);

                $content=linkify($page, $page, $content);
                $content=linkify($page, $page, $content);

-               $content=preprocess($page, $content);
-               $content=htmlize($type, $content);
+               $content=htmlize($page, $type, $content);

                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},


@@ -323,6 +201,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

+                       $_=decode_utf8($_);

                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }


@@ -342,6 +221,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

+                       $_=decode_utf8($_);

                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }


@@ -374,6 +254,7 @@ sub refresh () { #{{{
                        debug("new page $page") unless exists $pagectime{$page};
                        push @add, $file;
                        $links{$page}=[];
                        debug("new page $page") unless exists $pagectime{$page};
                        push @add, $file;
                        $links{$page}=[];

+                       $pagecase{lc $page}=$page;

                        $pagesources{$page}=$file;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
                        $pagesources{$page}=$file;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");


@@ -400,8 +281,9 @@ sub refresh () { #{{{
                my $page=pagename($file);
                
                if (! exists $oldpagemtime{$page} ||
                my $page=pagename($file);
                
                if (! exists $oldpagemtime{$page} ||

-                   mtime(srcfile($file)) > $oldpagemtime{$page}) {
-                       debug("rendering changed file $file");
+                   mtime(srcfile($file)) > $oldpagemtime{$page} ||
+                   $forcerebuild{$page}) {
+                       debug("rendering $file");

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


@@ -441,7 +323,7 @@ FILE:               foreach my $file (@files) {
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);

-                                       if (globlist_match($page, $depends{$p})) {
+                                       if (pagespec_match($page, $depends{$p})) {

                                                debug("rendering $f, which depends on $page");
                                                render($f);
                                                $rendered{$f}=1;
                                                debug("rendering $f, which depends on $page");
                                                render($f);
                                                $rendered{$f}=1;


@@ -484,15 +366,11 @@ FILE:             foreach my $file (@files) {
                }
        }
 
                }
        }
 

-       if (@del && exists $hooks{delete}) {
-               foreach my $id (keys %{$hooks{delete}}) {
-                       $hooks{delete}{$id}{call}->(@del);
-               }
+       if (@del) {
+               run_hooks(delete => sub { shift->(@del) });

        }
        }

-       if (%rendered && exists $hooks{change}) {
-               foreach my $id (keys %{$hooks{change}}) {
-                       $hooks{change}{$id}{call}->(keys %rendered);
-               }
+       if (%rendered) {
+               run_hooks(change => sub { shift->(keys %rendered) });

        }
 } #}}}
 
        }
 } #}}}