X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fbfcea89f8e06426c73ab8ea369ca4cdc566db6f..d09bf0754f650399b7fc7227106f761ddbd24f0d:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c79c8ccc0..cd367da70 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -107,12 +107,12 @@ sub preprocess (@) {
 		# fallthrough
 	}
 	elsif ($key eq 'license') {
-		push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
+		push @{$metaheaders{$page}}, '<link rel="license" href="#pagelicense" />';
 		$pagestate{$page}{meta}{license}=$value;
 		return "";
 	}
 	elsif ($key eq 'copyright') {
-		push @{$metaheaders{$page}}, '<link rel="copyright" href="#page_copyright" />';
+		push @{$metaheaders{$page}}, '<link rel="copyright" href="#pagecopyright" />';
 		$pagestate{$page}{meta}{copyright}=$value;
 		return "";
 	}
@@ -121,6 +121,18 @@ sub preprocess (@) {
 		add_link($page, $value);
 		return "";
 	}
+	elsif ($key eq 'enclosure') {
+		my $link=bestlink($page, $value);
+		if (! length $link) {
+			error gettext("enclosure not found")
+		}
+		add_depends($page, $link, deptype("presence"));
+
+		$value=urlto($link, $page, 1);
+		$pagestate{$page}{meta}{enclosure}=$value;
+		$pagestate{$page}{meta}{enclosurefile}=$link;
+		# fallthrough
+	}
 	elsif ($key eq 'author') {
 		$pagestate{$page}{meta}{author}=$value;
 		if (exists $params{sortas}) {
@@ -143,14 +155,30 @@ sub preprocess (@) {
 		eval q{use Date::Parse};
 		if (! $@) {
 			my $time = str2time($value);
-			$IkiWiki::pagectime{$page}=$time if defined $time;
+			if (defined $time) {
+				$IkiWiki::pagectime{$page}=$time;
+			}
+			else {
+				error(sprintf(gettext('cannot parse date/time: %s'), $value));
+			}
+		}
+		else {
+			error $@;
 		}
 	}
 	elsif ($key eq 'updated') {
 		eval q{use Date::Parse};
 		if (! $@) {
 			my $time = str2time($value);
-			$pagestate{$page}{meta}{updated}=$time if defined $time;
+			if (defined $time) {
+				$pagestate{$page}{meta}{updated}=$time;
+			}
+			else {
+				error(sprintf(gettext('cannot parse date/time: %s'), $value));
+			}
+		}
+		else {
+			error $@;
 		}
 	}
 
@@ -282,6 +310,7 @@ sub preprocess (@) {
 	elsif ($key eq 'name') {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.
 			encode_entities($value).
+			'" '.
 			join(' ', map { "$_=\"$params{$_}\"" } keys %params).
 			' />', $page, $destpage);
 	}
@@ -318,7 +347,12 @@ sub pagetemplate (@) {
 		$template->param(title_overridden => 1);
 	}
 
+	if (exists $pagestate{$page}{meta}{enclosure}) {
+		$template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));
+	}
+
 	foreach my $field (qw{authorurl}) {
+		eval q{use HTML::Entities};
 		$template->param($field => HTML::Entities::encode_entities($pagestate{$page}{meta}{$field}))
 			if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
 	}