X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/906dcfd518c9597dd68ddf30c28bb68e9cbf8555..7e7dea078bce3437b9a14d96079ddd68a5f0aab9:/IkiWiki/Plugin/meta.pm?ds=inline diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index a4dd541f9..eebe3460f 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -4,43 +4,74 @@ package IkiWiki::Plugin::meta; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; -my %meta; -my %title; -my %permalink; -my %author; -my %authorurl; -my %license; -my %copyright; +my %metaheaders; -sub import { #{{{ +sub import { + hook(type => "getsetup", id => "meta", call => \&getsetup); + 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}}=''; +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + section => "core", + }, +} - return $params{content}; -} # }}} +sub needsbuild (@) { + my $needsbuild=shift; + foreach my $page (keys %pagestate) { + if (exists $pagestate{$page}{meta}) { + if (exists $pagesources{$page} && + 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}; + } + } + } + return $needsbuild; +} -sub scrub ($) { #{{{ +sub scrub ($$$) { if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) { - return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift); + return IkiWiki::Plugin::htmlscrubber::sanitize( + content => shift, page => shift, destpage => shift); } else { return shift; } -} #}}} +} -sub preprocess (@) { #{{{ - if (! @_) { - return ""; +sub safeurl ($) { + my $url=shift; + if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} && + defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) { + return $url=~/$IkiWiki::Plugin::htmlscrubber::safe_url_regexp/; + } + else { + return 1; } +} + +sub htmlize ($$$) { + my $page = shift; + my $destpage = shift; + + return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}), + IkiWiki::linkify($page, $destpage, + IkiWiki::preprocess($page, $destpage, shift))); +} + +sub preprocess (@) { + return "" unless @_; my %params=@_; my $key=shift; my $value=$params{$key}; @@ -52,27 +83,61 @@ sub preprocess (@) { #{{{ 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"); + # Metadata collection that needs to happen during the scan pass. + if ($key eq 'title') { + $pagestate{$page}{meta}{title}=$value; + if (exists $params{sortas}) { + $pagestate{$page}{meta}{titlesort}=$params{sortas}; + } + else { + delete $pagestate{$page}{meta}{titlesort}; + } + return ""; + } + elsif ($key eq 'description') { + $pagestate{$page}{meta}{description}=$value; + # fallthrough + } + elsif ($key eq 'guid') { + $pagestate{$page}{meta}{guid}=$value; + # fallthrough + } + elsif ($key eq 'license') { + push @{$metaheaders{$page}}, ''; + $pagestate{$page}{meta}{license}=$value; + return ""; + } + elsif ($key eq 'copyright') { + push @{$metaheaders{$page}}, ''; + $pagestate{$page}{meta}{copyright}=$value; + return ""; + } + elsif ($key eq 'link' && ! %params) { + # hidden WikiLink + add_link($page, $value); + return ""; + } + elsif ($key eq 'author') { + $pagestate{$page}{meta}{author}=$value; + if (exists $params{sortas}) { + $pagestate{$page}{meta}{authorsort}=$params{sortas}; } else { - # hidden WikiLink - push @{$links{$page}}, $value; + delete $pagestate{$page}{meta}{authorsort}; } + # fallthorough } - elsif ($key eq 'title') { - $title{$page}=HTML::Entities::encode_numeric($value); + elsif ($key eq 'authorurl') { + $pagestate{$page}{meta}{authorurl}=$value if safeurl($value); + # fallthrough } elsif ($key eq 'permalink') { - $permalink{$page}=$value; - $meta{$page}.=scrub("\n"); + $pagestate{$page}{meta}{permalink}=$value if safeurl($value); + # fallthrough } elsif ($key eq 'date') { eval q{use Date::Parse}; @@ -81,6 +146,25 @@ sub preprocess (@) { #{{{ $IkiWiki::pagectime{$page}=$time if defined $time; } } + elsif ($key eq 'updated') { + eval q{use Date::Parse}; + if (! $@) { + my $time = str2time($value); + $pagestate{$page}{meta}{updated}=$time if defined $time; + } + } + + if (! defined wantarray) { + # avoid collecting duplicate data during scan pass + return; + } + + # Metadata handling that happens only during preprocessing pass. + if ($key eq 'permalink') { + if (safeurl($value)) { + push @{$metaheaders{$page}}, scrub('', $page, $destpage); + } + } elsif ($key eq 'stylesheet') { my $rel=exists $params{rel} ? $params{rel} : "alternate stylesheet"; my $title=exists $params{title} ? $params{title} : $value; @@ -88,65 +172,264 @@ sub preprocess (@) { #{{{ # editable page as a stylesheet my $stylesheet=bestlink($page, $value.".css"); if (! length $stylesheet) { - return "[[meta ".gettext("stylesheet not found")."]]"; + error gettext("stylesheet not found") } - $meta{$page}.='\n"; + "\" type=\"text/css\" />", $page, $destpage); + } + elsif ($key eq 'script') { + my $defer=exists $params{defer} ? ' defer="defer"' : ''; + my $async=exists $params{async} ? ' async="async"' : ''; + my $js=bestlink($page, $value.".js"); + if (! length $js) { + error gettext("script not found"); + } + push @{$metaheaders{$page}}, scrub('