Changeset 1744 for trunk/gsdl/perllib/plugins/ImagePlug.pm

Timestamp:

2000-12-05T23:20:11+13:00 (23 years ago)

Author:

say1

Message:

about a billion changes to ImagePlug

File:

• trunk/gsdl/perllib/plugins/ImagePlug.pm (modified) (9 diffs)

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -32 +32 @@
 }
 
+use strict;
+sub print_general_usage {
+    my ($plugin_name) = @_;
+
+    print STDERR "\n  usage: plugin $plugin_name [options]\n\n";
+    print STDERR "   -noscaleup       Don't scale up small images when making thumbnails\n";
+    print STDERR "   -thumbnailtype s Make thumbnails in format 's'\n";
+    print STDERR "   -thumbnailsize n Make thumbnails of size nxn\n";
+    print STDERR "   -convertto s     Convert main inage to (gif|png|jpg)\n";
+    print STDERR "\n";
+}
+
 sub new {
     my ($class) = @_;
+    my $plugin_name = shift (@_);
     my $self = new BasPlug ("ImagePlug", @_);
+    # general options available to all plugins
+
+    if (!parsargv::parse(\@_,
+             q^noscaleup^, \$self->{'noscaleup'},
+             q^thumbnailtype/.*/gif^, \$self->{'thumbnailtype'},
+             q^converttotype/.*/^, \$self->{'converttotype'},
+             q^thumbnailsize/[0-9]*/100^, \$self->{'thumbnailsize'},
+             "allow_extra_options")) {
+    
+    print STDERR "\nThe $plugin_name plugin uses an incorrect general option (general options are those\n";
+    print STDERR "available to all plugins). Check your collect.cfg configuration file.\n";
+        &print_general_usage($plugin_name);
+    die "\n";
+    }
 
     return bless $self, $class;
@@ -42 +69 @@
     my $self = shift (@_);
 
-    return q^(?i)(\.jpe?g|\.gif|\.png|\.tiff?)$^; 
+    return q^(?i)(\.jpe?g|\.gif|\.png|\.bmp|\.tiff?)$^; 
 }
 
@@ -50 +77 @@
     my $file = shift (@_);
     my $doc_obj = shift (@_);
-
+    my $section = $doc_obj->get_top_section();
+
+    if ($file eq "" || $filename eq "") {
+    return "";
+    }
+    if ($filename =~ m/thumbnail/) {
+    return "";
+    }
+    if ($filename =~ m/converted/) {
+    return "";
+    }
+    if ($filename =~ m/\..*\./) {
+    return "";
+    }
+
+    my $thumbSize = $self->{'thumbnailsize'};
+    if ($thumbSize eq "") { $thumbSize = 100; };
+    my $converttotype = $self->{'converttotype'};
+    my $thumbnailtype = $self->{'thumbnailtype'};
+    if ($thumbnailtype eq "") { $thumbnailtype = "gif"; };
+    my $originalfilename = ""; # only set if we do a conversion
+    my $thumbnailfilename = "";
+    
     my $type = "unknown";
-
-    if (-e "$filename.thumbnail.gif") {
-    print "ImagePlug: both \"$filename\" and \"$filename.thumbnail.gif\" exist.\n";
-    return undef;
-    }
-
+    
+    #see if we need to convert ...
+    if ($converttotype ne "" && $filename =~ m/$converttotype$/)
+    {
+    $originalfilename = $filename;
+    $filename = &util::get_tmp_filename();
+    $filename = "$filename.$converttotype";
+    $self->{'tmp_filename'} = $filename;
+    if (-e $filename) {
+        print STDERR "File names to convert from and to are the same. choking in Imageplug on \"$filename\"\n";
+        return "";
+        }
+    my $result = "";
+    my $command = "convert -verbose $originalfilename $filename";
+    $result = `$command`;
+    print STDERR "$command\n"
+        if $self->{'verbosity'} > 2;
+    print STDERR "$result\n"
+        if $self->{'verbosity'} > 3;
+    $type = $converttotype;
+    }
+    
+    #check that the thumbnail doesn't already exist ...
+    $thumbnailfilename = &util::get_tmp_filename();
+    $thumbnailfilename = $thumbnailfilename . ".thumbnail.$thumbnailtype";
+    $self->{'tmp_filename2'} = $thumbnailfilename;
+
+    #make the thumbnail
     my $result = "";
-    $result = `convert -verbose -loop 1 -delay 1 -geometry 100x100 $filename $filename.thumbnail.gif` ;
-    my $section = $doc_obj->get_top_section();
-
-    if ($result =~ m/=>.* ([0-9]+)x([0-9]+)=>([0-9]+)x([0-9]+)/) {
+    my $command = "convert -verbose -geometry $thumbSize" . "x$thumbSize $filename $thumbnailfilename";
+    $result = `$command` ;
+    print STDERR "$command\n"
+        if $self->{'verbosity'} > 2;
+    print STDERR "$result\n"
+        if $self->{'verbosity'} > 3;
+    
+    if ($result =~ m/=>.* ([0-9]+)x([0-9]+)=>([0-9]+)x([0-9]+)/m) {
     $doc_obj->add_metadata ($section, "ImageHeight", $1);
     $doc_obj->add_metadata ($section, "ImageWidth", $2);
@@ -68 +143 @@
     $doc_obj->add_metadata ($section, "ThumbWidth", $4);
     }
-    my $size = "";
+    
+    my $size = "unknown";
     if ($result =~ m/^[^\n]* ([0-9]+)b/) {
     $size = $1;
@@ -75 +151 @@
     $size = 1024 * $1;
     }
-
-    if ($result =~ m/^[^\n]*JPE?G/) {
+    
+    if ($result =~ m/^[^\n]*JPE?G/i) {
     $type = "jpeg";
     }
-    if ($result =~ m/^[^\n]*GIF/) {
+    if ($result =~ m/^[^\n]*GIF/i) {
     $type = "gif";
     }
-    if ($result =~ m/^[^\n]*PNG/) {
+    if ($result =~ m/^[^\n]*PNG/i) {
     $type = "png";
     }
-    if ($result =~ m/^[^\n]*TIFF?/) {
+    if ($result =~ m/^[^\n]*TIF?F/i) {
     $type = "tiff";
     }
-    
-    if ($type ne "unknown") {
-    $doc_obj->add_metadata ($section, "ImageType", $type);
-    }
-    $doc_obj->add_metadata ($section, "ThumbType", "gif");
+    if ($result =~ m/^[^\n]*BMP/i) {
+    $type = "bmp";
+    }
+    
+    #if there's a leading directory name, eat it...
+    $file =~ s/^[^\/\\]*[\/\\]//;
+    
+    $doc_obj->add_metadata ($section, "ImageType", $type);
     $doc_obj->add_metadata ($section, "Image", "$file");
-    $doc_obj->add_metadata ($section, "Thumb", "$file.thumbnail.gif");
-    if ($size != 0) {
-    $doc_obj->add_metadata ($section, "ImageSize", $size);
-    }
-    print $result;
+    $doc_obj->add_metadata ($section, "ImageSize", $size);
+    
+    #add the thumbnail as an associated file ...
+    if (-e "$thumbnailfilename") { 
+    $doc_obj->associate_file("$thumbnailfilename","thumbnail.$thumbnailtype","image/$thumbnailtype",$section);
+    $doc_obj->add_metadata ($section, "ThumbType", $thumbnailtype);
+    $doc_obj->add_metadata ($section, "Thumb", "thumbnail.$thumbnailtype");
+    } else {
+    print STDERR "ImagePlug: couldn't find \"$thumbnailfilename\"\n";
+    }
+    
+    #add the image as an associated file ...
+    $doc_obj->associate_file($filename,$file,"image/$type",$section);
+        
     return $type;
 }
@@ -121 +209 @@
 
     my $filename = &util::filename_cat($base_dir, $file);
+    print STDERR "ImagePlug: called on \"$filename\"\n"
+        if $self->{'verbosity'} > 1;
     return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;
     if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
@@ -132 +222 @@
     
     #run convert to get the thumbnail and extract size and type info
-    my $mimetype = run_convert($self, $filename, $file, $doc_obj);
-
-    #add the image as an associated file ...
-    if (-e "$filename.thumbnail.gif") {
-    $doc_obj->associate_file("$filename.thumbnail.gif","$file.thumbnail.gif","image/gif",$section);
-    } else {
-    print "ImagePlug: couldn't find \"$filename.thumbnail.gif\"\n";
-    }
-
-    if (defined $mimetype) {
-    $doc_obj->associate_file($filename,$file,"image/$mimetype",$section);
+    my $thumbnailfile = run_convert($self, $filename, $file, $doc_obj);
+    
+    if (!defined $thumbnailfile)
+    {
+    print "ImagePlug: couldn't process \"$filename\"\n";
+    return 0;
     }
 
@@ -150 +235 @@
     # include any metadata passed in from previous plugins 
     # note that this metadata is associated with the top level section
+    my $section = $doc_obj->get_top_section();
     $self->extra_metadata ($doc_obj, $section, $metadata);
 
@@ -166 +252 @@
     $processor->process($doc_obj);
 
-    if (-e "$filename.thumbnail.gif") {
-      util::rm("$filename.thumbnail.gif");
+    if (defined $self->{'tmp_filename'} && 
+    -e $self->{'tmp_filename'}) {
+      util::rm($self->{'tmp_filename'})
+    }
+    if (defined $self->{'tmp_filename2'} && 
+    -e $self->{'tmp_filename2'}) {
+      util::rm($self->{'tmp_filename2'})
     }