X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/eabe03fb5bcb06b950d25e6c1e7881a441ab284d..68a9345b5c17fe007373c567666a25e6dc5544fa:/IkiWiki/Plugin/meta.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index f498398a2..d2c6e7f8b 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -11,20 +11,28 @@ my %title; my %permalink; my %author; my %authorurl; +my %license; +my %copyright; sub import { #{{{ + hook(type => "needsbuild", id => "meta", call => \&needsbuild); hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); - hook(type => "filter", id => "meta", call => \&filter); hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); } # }}} -sub filter (@) { #{{{ - my %params=@_; - - $meta{$params{page}}=''; - - return $params{content}; -} # }}} +sub needsbuild (@) { #{{{ + my $needsbuild=shift; + foreach my $page (keys %pagestate) { + if (exists $pagestate{$page}{meta}) { + if (grep { $_ eq $pagesources{$page} } @$needsbuild) { + # remove state, it will be re-added + # if the preprocessor directive is still + # there during the rebuild + delete $pagestate{$page}{meta}; + } + } + } +} sub scrub ($) { #{{{ if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) { @@ -35,49 +43,77 @@ sub scrub ($) { #{{{ } } #}}} +sub htmlize ($$$) { #{{{ + my $page = shift; + my $destpage = shift; + + return IkiWiki::htmlize($page, pagetype($pagesources{$page}), + IkiWiki::linkify($page, $destpage, + IkiWiki::preprocess($page, $destpage, shift))); +} + sub preprocess (@) { #{{{ - if (! @_) { - return ""; - } + return "" unless @_; my %params=@_; my $key=shift; my $value=$params{$key}; delete $params{$key}; my $page=$params{page}; delete $params{page}; + my $destpage=$params{destpage}; delete $params{destpage}; delete $params{preview}; eval q{use HTML::Entities}; - # Always dencode, even if encoding later, since it might not be + # Always decode, even if encoding later, since it might not be # fully encoded. $value=decode_entities($value); - if ($key eq 'link') { - if (%params) { - $meta{$page}.=scrub("\n"); - } - else { - # hidden WikiLink - push @{$links{$page}}, $value; - } - } - elsif ($key eq 'title') { + # Metadata collection that needs to happen during the scan pass. + if ($key eq 'title') { $title{$page}=HTML::Entities::encode_numeric($value); } - elsif ($key eq 'permalink') { - $permalink{$page}=$value; - $meta{$page}.=scrub("\n"); + elsif ($key eq 'license') { + push @{$meta{$page}}, ''; + $license{$page}=$value; + return ""; + } + elsif ($key eq 'copyright') { + push @{$meta{$page}}, ''; + $copyright{$page}=$value; + return ""; + } + elsif ($key eq 'link' && ! %params) { + # hidden WikiLink + push @{$links{$page}}, $value; + return ""; + } + elsif ($key eq 'author') { + $author{$page}=$value; + # fallthorough } - elsif ($key eq 'date') { + elsif ($key eq 'authorurl') { + $authorurl{$page}=$value; + # fallthrough + } + + if (! defined wantarray) { + # avoid collecting duplicate data during scan pass + return; + } + + # Metadata collection that happens only during preprocessing pass. + if ($key eq 'date') { eval q{use Date::Parse}; if (! $@) { my $time = str2time($value); $IkiWiki::pagectime{$page}=$time if defined $time; } } + elsif ($key eq 'permalink') { + $permalink{$page}=$value; + push @{$meta{$page}}, scrub(''); + } elsif ($key eq 'stylesheet') { my $rel=exists $params{rel} ? $params{rel} : "alternate stylesheet"; my $title=exists $params{title} ? $params{title} : $value; @@ -87,29 +123,70 @@ sub preprocess (@) { #{{{ if (! length $stylesheet) { return "[[meta ".gettext("stylesheet not found")."]]"; } - $meta{$page}.='\n"; + "\" type=\"text/css\" />"; } elsif ($key eq 'openid') { if (exists $params{server}) { - $meta{$page}.='\n"; + push @{$meta{$page}}, ''; } - $meta{$page}.='\n"; + push @{$meta{$page}}, ''; } - else { - $meta{$page}.=scrub("\n"); - if ($key eq 'author') { - $author{$page}=$value; + elsif ($key eq 'redir') { + return "" if $page ne $destpage; + my $safe=0; + if ($value !~ /^\w+:\/\//) { + my ($redir_page, $redir_anchor) = split /\#/, $value; + + add_depends($page, $redir_page); + my $link=bestlink($page, $redir_page); + if (! length $link) { + return "[[meta ".gettext("redir page not found")."]]"; + } + + $value=urlto($link, $page); + $value.='#'.$redir_anchor if defined $redir_anchor; + $safe=1; + + # redir cycle detection + $pagestate{$page}{meta}{redir}=$link; + my $at=$page; + my %seen; + while (exists $pagestate{$at}{meta}{redir}) { + if ($seen{$at}) { + return "[[meta ".gettext("redir cycle is not allowed")."]]"; + } + $seen{$at}=1; + $at=$pagestate{$at}{meta}{redir}; + } } - elsif ($key eq 'authorurl') { - $authorurl{$page}=$value; + else { + $value=encode_entities($value); + } + my $delay=int(exists $params{delay} ? $params{delay} : 0); + my $redir=""; + if (! $safe) { + $redir=scrub($redir); + } + push @{$meta{$page}}, $redir; + } + elsif ($key eq 'link') { + if (%params) { + push @{$meta{$page}}, scrub("\n"); } } + else { + push @{$meta{$page}}, scrub(''); + } return ""; } # }}} @@ -117,10 +194,14 @@ sub preprocess (@) { #{{{ sub pagetemplate (@) { #{{{ my %params=@_; my $page=$params{page}; + my $destpage=$params{destpage}; my $template=$params{template}; - $template->param(meta => $meta{$page}) - if exists $meta{$page} && $template->query(name => "meta"); + if (exists $meta{$page} && $template->query(name => "meta")) { + # avoid duplicate meta lines + my %seen; + $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$meta{$page}})); + } if (exists $title{$page} && $template->query(name => "title")) { $template->param(title => $title{$page}); $template->param(title_overridden => 1); @@ -131,7 +212,17 @@ sub pagetemplate (@) { #{{{ if exists $author{$page} && $template->query(name => "author"); $template->param(authorurl => $authorurl{$page}) if exists $authorurl{$page} && $template->query(name => "authorurl"); - + + if (exists $license{$page} && $template->query(name => "license") && + ($page eq $destpage || ! exists $license{$destpage} || + $license{$page} ne $license{$destpage})) { + $template->param(license => htmlize($page, $destpage, $license{$page})); + } + if (exists $copyright{$page} && $template->query(name => "copyright") && + ($page eq $destpage || ! exists $copyright{$destpage} || + $copyright{$page} ne $copyright{$destpage})) { + $template->param(copyright => htmlize($page, $destpage, $copyright{$page})); + } } # }}} 1