Pass along wrapper args to ikiwiki, then handle the "cvs add dir"

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 20893f56c284812783c2ab31f699b9ae4a8b9473..68b001671653000b4907ababf1d63782d834381c 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,81 +5,152 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
-use Image::Magick;
-
-my $convert = 'convert';
+use IkiWiki 3.00;

 
 my %imgdefaults;
 
 
 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 getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}

 
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
        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') {
 
        if ($image eq 'defaults') {

-               $imgdefaults{$params{page}} = {
-                       size => $size,
-                       alt => $alt,
-               };
+               $imgdefaults{$params{page}} = \%params;

                return '';
        }
 
                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 $file = bestlink($params{page}, $image);
+       my $srcfile = srcfile($file, 1);
+       if (! length $file || ! defined $srcfile) {
+               return htmllink($params{page}, $params{destpage}, $image);
+       }

 
 

-       my $dir = IkiWiki::dirname($file);
+       my $dir = $params{page};

        my $base = IkiWiki::basename($file);
        my $base = IkiWiki::basename($file);

+
+       eval q{use Image::Magick};
+       error gettext("Image::Magick is not installed") if $@;

        my $im = Image::Magick->new;
        my $imglink;
        my $r;
 
        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') {
+               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";
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";

+               

                will_render($params{page}, $imglink);
 
                will_render($params{page}, $imglink);
 

-               if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
+               if (-e $outfile && (-M $srcfile >= -M $outfile)) {

                        $r = $im->Read($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 {
                }
                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}");
 
                        $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 {
                }
        }
        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;
        }
 
                $imglink = $file;
        }
 

-       add_depends($imglink, $params{page});
+       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='<img src="'.$imgurl.
+               '" width="'.$im->Get("width").
+               '" height="'.$im->Get("height").'"'.
+               (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}.'"' : '').
+               ' />';
+
+       if (! defined $params{link} || lc($params{link}) eq 'yes') {
+               $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+       }
+       elsif ($params{link} =~ /^\w+:\/\//) {
+               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+       }
+       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);
+       }

 
 

-       return '<a href="'.
-               IkiWiki::abs2rel($file, IkiWiki::dirname($params{destpage})).
-               '"><img src="'.
-               IkiWiki::abs2rel($imglink, IkiWiki::dirname($params{destpage})).
-               '" alt="'.$alt.'" width="'.$im->Get("width").
-               '" height="'.$im->Get("height").'" /></a>';
-} #}}}
+       if (exists $params{caption}) {
+               return '<table class="img">'.
+                       '<caption>'.$params{caption}.'</caption>'.
+                       '<tr><td>'.$imgtag.'</td></tr>'.
+                       '</table>';
+       }
+       else {
+               return $imgtag;
+       }
+}

 
 

-1;
+1