X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e54d901565da5349b8f21e3e326d0f2d5d601ed9..c23abb3553cf03e9b85aff0e9a6cc8e1c55acde5:/IkiWiki/Plugin/img.pm?ds=inline

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index bde5a3e1a..b6e7c9e41 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,15 +5,12 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki;
-use Image::Magick;
-
-my $convert = 'convert';
+use IkiWiki 2.00;
 
 my %imgdefaults;
 
 sub import { #{{{
-	hook(type => "preprocess", id => "img", call => \&preprocess);
+	hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
 } #}}}
 
 sub preprocess (@) { #{{{
@@ -34,52 +31,98 @@ sub preprocess (@) { #{{{
 		return '';
 	}
 
-	my $file = bestlink($params{page}, $image) || return "[[img $image not found]]";
-	add_depends($params{page}, $file);
+	push @{$links{$params{page}}}, $image;
+	# optimisation: detect scan mode, and avoid generating the image
+	if (! defined wantarray) {
+		return;
+	}
+
+	my $file = bestlink($params{page}, $image);
 
-	my $dir = IkiWiki::dirname($file);
+	my $dir = $params{page};
 	my $base = IkiWiki::basename($file);
+
+	eval q{use Image::Magick};
+	error($@) if $@;
 	my $im = Image::Magick->new;
 	my $imglink;
 	my $r;
 
 	if ($size ne 'full') {
 		my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
-		return "[[img bad size \"$size\"]]" unless (defined $w && defined $h);
+		return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
+			unless (defined $w && defined $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)) {
 			$r = $im->Read($outfile);
-			return "[[img failed to read $outfile: $r]]" if $r;
+			return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
 		}
 		else {
 			$r = $im->Read(srcfile($file));
-			return "[[img failed to read $file: $r]]" if $r;
+			return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 
 			$r = $im->Resize(geometry => "${w}x${h}");
-			return "[[img failed to resize: $r]]" if $r;
-
-			my @blob = $im->ImageToBlob();
-			writefile($imglink, $config{destdir}, $blob[0], 1);
+			return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
+
+			# don't actually write file in preview mode
+			if (! $params{preview}) {
+				my @blob = $im->ImageToBlob();
+				writefile($imglink, $config{destdir}, $blob[0], 1);
+			}
+			else {
+				$imglink = $file;
+			}
 		}
 	}
 	else {
 		$r = $im->Read(srcfile($file));
-		return "[[img failed to read $file: $r]]" if $r;
+		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 		$imglink = $file;
 	}
 
 	add_depends($imglink, $params{page});
 
-	return '<a href="'.
-		IkiWiki::abs2rel($file, IkiWiki::dirname($params{destpage})).
-		'"><img src="'.
-		IkiWiki::abs2rel($imglink, IkiWiki::dirname($params{destpage})).
+	my ($fileurl, $imgurl);
+	if (! $params{preview}) {
+		$fileurl=urlto($file, $params{destpage});
+		$imgurl=urlto($imglink, $params{destpage});
+	}
+	else {
+		$fileurl="$config{url}/$file";
+		$imgurl="$config{url}/$imglink";
+	}
+
+	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
+		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+	}
+
+	my $imgtag='<img src="'.$imgurl.
 		'" alt="'.$alt.'" width="'.$im->Get("width").
-		'" height="'.$im->Get("height").'" /></a>';
+		'" height="'.$im->Get("height").'"'.
+		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
+		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
+		' />';
+
+	if (! defined $params{link} || lc($params{link}) eq 'yes') {
+		return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+	}
+	elsif ($params{link} =~ /^\w+:\/\//) {
+		return  '<a href="'.$params{link}.'">'.$imgtag.'</a>';
+	}
+	elsif (length bestlink($params{page}, $params{link})) {
+		add_depends($params{page}, $params{link});
+		return htmllink($params{page}, $params{destpage},
+			$params{link}, linktext => $imgtag,
+			noimageinline => 1);
+	}
+	else {
+		return $imgtag;
+	}
 } #}}}
 
-1;
+1