X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2725887734c318350875501e64561f79b8866dfe..059d6f01fa7b34b67d60b99ccbc21bf188543531:/IkiWiki/Plugin/img.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 2a6533e39..a697fea19 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -5,81 +5,150 @@ package IkiWiki::Plugin::img; use warnings; use strict; -use IkiWiki; +use IkiWiki 3.00; my %imgdefaults; -sub import { #{{{ - hook(type => "preprocess", id => "img", call => \&preprocess); -} #}}} +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} || ''; if ($image eq 'defaults') { - $imgdefaults{$params{page}} = { - size => $size, - alt => $alt, - }; + $imgdefaults{$params{page}} = \%params; return ''; } - add_depends($params{page}, $image); - my $file = bestlink($params{page}, $image) || return "[[img $image not found]]"; + add_link($params{page}, $image); + # optimisation: detect scan mode, and avoid generating the image + if (! defined wantarray) { + return; + } - my $dir = IkiWiki::dirname($file); + 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 bad size \"$size\"]]" unless (defined $w && defined $h); + if ($params{size} ne 'full') { + my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/); + error sprintf(gettext('bad size "%s"'), $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 failed to read $outfile: $r]]" if $r; + error 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; + $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 failed to resize: $r]]" if $r; - - my @blob = $im->ImageToBlob(); - writefile($imglink, $config{destdir}, $blob[0], 1); + error 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; + $r = $im->Read($srcfile); + error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; $imglink = $file; } add_depends($imglink, $params{page}); - return ''.$alt.''; -} #}}} + 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"))) { + error sprintf(gettext("failed to determine size of image %s"), $file) + } + + my $imgtag=''.$params{alt}.''; + + if (! defined $params{link} || lc($params{link}) eq 'yes') { + $imgtag=''.$imgtag.''; + } + elsif ($params{link} =~ /^\w+:\/\//) { + $imgtag=''.$imgtag.''; + } + elsif (length bestlink($params{page}, $params{link})) { + add_depends($params{page}, $params{link}); + $imgtag=htmllink($params{page}, $params{destpage}, + $params{link}, linktext => $imgtag, + noimageinline => 1); + } + + if (exists $params{caption}) { + return ''. + ''. + ''. + '
'.$params{caption}.'
'.$imgtag.'
'; + } + else { + return $imgtag; + } +} -1; +1