X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f6b47b0d1c67228f13242864a50827b40abb320c..5c0e56d149c6b33d010561f64f583e7ad1c529da:/IkiWiki/Plugin/img.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c4e0fdd89..68b001671 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,73 +5,89 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %imgdefaults;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "img", call => \&getsetup);
 	hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
 	my %params=@_;
 
-	if (! exists $imgdefaults{$params{page}}) {
-		$imgdefaults{$params{page}} = {};
+	if (exists $imgdefaults{$params{page}}) {
+		foreach my $key (keys %{$imgdefaults{$params{page}}}) {
+			if (! exists $params{$key}) {
+				$params{$key}=$imgdefaults{$params{page}}->{$key};
+			}
+		}
+	}
+
+	if (! exists $params{size}) {
+		$params{size}='full';
 	}
-	my $size = $params{size} || $imgdefaults{$params{page}}->{size} || 'full';
-	my $alt = $params{alt} || $imgdefaults{$params{page}}->{alt} || '';
-	my $title = $params{title} || $imgdefaults{$params{page}}->{title} || '';
-	my $caption = $params{caption} || $imgdefaults{$params{page}}->{caption} || '';
 
 	if ($image eq 'defaults') {
-		$imgdefaults{$params{page}} = {
-			size => $size,
-			alt => $alt,
-			title => $title,
-			caption => $caption,
-		};
+		$imgdefaults{$params{page}} = \%params;
 		return '';
 	}
 
-	push @{$links{$params{page}}}, $image;
+	add_link($params{page}, $image);
+
 	# optimisation: detect scan mode, and avoid generating the image
 	if (! defined wantarray) {
 		return;
 	}
 
 	my $file = bestlink($params{page}, $image);
+	my $srcfile = srcfile($file, 1);
+	if (! length $file || ! defined $srcfile) {
+		return htmllink($params{page}, $params{destpage}, $image);
+	}
 
 	my $dir = $params{page};
 	my $base = IkiWiki::basename($file);
 
 	eval q{use Image::Magick};
-	error($@) if $@;
+	error gettext("Image::Magick is not installed") if $@;
 	my $im = Image::Magick->new;
 	my $imglink;
 	my $r;
 
-	if ($size ne 'full') {
-		my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
-		return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
-			unless (defined $w && defined $h);
+	if ($params{size} ne 'full') {
+		add_depends($params{page}, $image);
+
+		my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
+		error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
+			unless (defined $w && defined $h &&
+			        (length $w || length $h));
 
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
 		$imglink = "$dir/${w}x${h}-$base";
 		
 		will_render($params{page}, $imglink);
 
-		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
+		if (-e $outfile && (-M $srcfile >= -M $outfile)) {
 			$r = $im->Read($outfile);
-			return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
+			error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
 		}
 		else {
-			$r = $im->Read(srcfile($file));
-			return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+			$r = $im->Read($srcfile);
+			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
 			$r = $im->Resize(geometry => "${w}x${h}");
-			return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
+			error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
 			# don't actually write file in preview mode
 			if (! $params{preview}) {
@@ -84,13 +100,11 @@ sub preprocess (@) { #{{{
 		}
 	}
 	else {
-		$r = $im->Read(srcfile($file));
-		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+		$r = $im->Read($srcfile);
+		error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 		$imglink = $file;
 	}
 
-	add_depends($imglink, $params{page});
-
 	my ($fileurl, $imgurl);
 	if (! $params{preview}) {
 		$fileurl=urlto($file, $params{destpage});
@@ -102,13 +116,15 @@ sub preprocess (@) { #{{{
 	}
 
 	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+		error sprintf(gettext("failed to determine size of image %s"), $file)
 	}
 
 	my $imgtag='<img src="'.$imgurl.
-		'" alt="'.$alt.'" width="'.$im->Get("width").
+		'" width="'.$im->Get("width").
 		'" height="'.$im->Get("height").'"'.
-		(defined $title ? ' title="'.$title.'"' : '').
+		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
+		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
+		(exists $params{align} ? ' align="'.$params{align}.'"' : '').
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
@@ -126,15 +142,15 @@ sub preprocess (@) { #{{{
 			noimageinline => 1);
 	}
 
-	if (defined $caption) {
+	if (exists $params{caption}) {
 		return '<table class="img">'.
-			'<caption>'.$caption.'</caption>'.
+			'<caption>'.$params{caption}.'</caption>'.
 			'<tr><td>'.$imgtag.'</td></tr>'.
 			'</table>';
 	}
 	else {
 		return $imgtag;
 	}
-} #}}}
+}
 
 1