X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/41efa5ac923c47ebd5538ee5894b11e9ccf7637c..6a955e86bb37b490f066886968ba8ba2c56907ef:/IkiWiki/Plugin/meta.pm?ds=inline

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 3991797c0..8dcd73a1a 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -4,26 +4,26 @@ package IkiWiki::Plugin::meta;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 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 => "pagetemplate", id => "meta", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{meta}) {
@@ -38,7 +38,7 @@ sub needsbuild (@) { #{{{
 	}
 }
 
-sub scrub ($$) { #{{{
+sub scrub ($$) {
 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
 		return IkiWiki::Plugin::htmlscrubber::sanitize(
 			content => shift, destpage => shift);
@@ -46,9 +46,9 @@ sub scrub ($$) { #{{{
 	else {
 		return shift;
 	}
-} #}}}
+}
 
-sub safeurl ($) { #{{{
+sub safeurl ($) {
 	my $url=shift;
 	if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
 	    defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {
@@ -57,9 +57,9 @@ sub safeurl ($) { #{{{
 	else {
 		return 1;
 	}
-} #}}}
+}
 
-sub htmlize ($$$) { #{{{
+sub htmlize ($$$) {
 	my $page = shift;
 	my $destpage = shift;
 
@@ -68,7 +68,7 @@ sub htmlize ($$$) { #{{{
 		IkiWiki::preprocess($page, $destpage, shift)));
 }
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	return "" unless @_;
 	my %params=@_;
 	my $key=shift;
@@ -110,7 +110,7 @@ sub preprocess (@) { #{{{
 	}
 	elsif ($key eq 'link' && ! %params) {
 		# hidden WikiLink
-		push @{$links{$page}}, $value;
+		add_link($page, $value);
 		return "";
 	}
 	elsif ($key eq 'author') {
@@ -121,6 +121,20 @@ sub preprocess (@) { #{{{
 		$pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
 		# fallthrough
 	}
+	elsif ($key eq 'date') {
+		eval q{use Date::Parse};
+		if (! $@) {
+			my $time = str2time($value);
+			$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
@@ -128,14 +142,7 @@ sub preprocess (@) { #{{{
 	}
 
 	# 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') {
+	if ($key eq 'permalink') {
 		if (safeurl($value)) {
 			$pagestate{$page}{meta}{permalink}=$value;
 			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
@@ -156,17 +163,22 @@ sub preprocess (@) { #{{{
 			"\" type=\"text/css\" />";
 	}
 	elsif ($key eq 'openid') {
+		my $delegate=0; # both by default
+		if (exists $params{delegate}) {
+			$delegate = 1 if lc $params{delegate} eq 'openid';
+			$delegate = 2 if lc $params{delegate} eq 'openid2';
+		}
 		if (exists $params{server} && safeurl($params{server})) {
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
-				'" rel="openid.server" />';
+				'" rel="openid.server" />' if $delegate ne 2;
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
-				'" rel="openid2.provider" />';
+				'" rel="openid2.provider" />' if $delegate ne 1;
 		}
 		if (safeurl($value)) {
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
-				'" rel="openid.delegate" />';
+				'" rel="openid.delegate" />' if $delegate ne 2;
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
-				'" rel="openid2.local_id" />';
+				'" rel="openid2.local_id" />' if $delegate ne 1;
 		}
 		if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
 			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
@@ -179,11 +191,11 @@ sub preprocess (@) { #{{{
 		if ($value !~ /^\w+:\/\//) {
 			my ($redir_page, $redir_anchor) = split /\#/, $value;
 
-			add_depends($page, $redir_page);
 			my $link=bestlink($page, $redir_page);
 			if (! length $link) {
 				error gettext("redir page not found")
 			}
+			add_depends($page, $link, deptype("presence"));
 
 			$value=urlto($link, $page);
 			$value.='#'.$redir_anchor if defined $redir_anchor;
@@ -230,9 +242,9 @@ sub preprocess (@) { #{{{
 	}
 
 	return "";
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
         my $page=$params{page};
         my $destpage=$params{destpage};
@@ -260,9 +272,9 @@ sub pagetemplate (@) { #{{{
 			$template->param($field => htmlize($page, $destpage, $pagestate{$page}{meta}{$field}));
 		}
 	}
-} # }}}
+}
 
-sub match { #{{{
+sub match {
 	my $field=shift;
 	my $page=shift;
 	
@@ -279,37 +291,37 @@ sub match { #{{{
 
 	if (defined $val) {
 		if ($val=~/^$re$/i) {
-			return IkiWiki::SuccessReason->new("$re matches $field of $page");
+			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page");
+			return IkiWiki::FailReason->new("$re does not match $field of $page", "" => 1);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field");
+		return IkiWiki::FailReason->new("$page does not have a $field", "" => 1);
 	}
-} #}}}
+}
 
 package IkiWiki::PageSpec;
 
-sub match_title ($$;@) { #{{{
-	IkiWiki::Plugin::meta::match("title", @_);	
-} #}}}
+sub match_title ($$;@) {
+	IkiWiki::Plugin::meta::match("title", @_);
+}
 
-sub match_author ($$;@) { #{{{
+sub match_author ($$;@) {
 	IkiWiki::Plugin::meta::match("author", @_);
-} #}}}
+}
 
-sub match_authorurl ($$;@) { #{{{
+sub match_authorurl ($$;@) {
 	IkiWiki::Plugin::meta::match("authorurl", @_);
-} #}}}
+}
 
-sub match_license ($$;@) { #{{{
+sub match_license ($$;@) {
 	IkiWiki::Plugin::meta::match("license", @_);
-} #}}}
+}
 
-sub match_copyright ($$;@) { #{{{
+sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
-} #}}}
+}
 
 1