Changeset 1758

Timestamp:

2000-12-07T11:48:22+13:00 (23 years ago)

Author:

say1

Message:

added minimum image size and a few bug fixes

File:

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

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -33 +33 @@
 
 use strict;
+
 sub print_general_usage {
     my ($plugin_name) = @_;
@@ -41 +42 @@
     print STDERR "   -thumbnailsize n Make thumbnails of size nxn\n";
     print STDERR "   -convertto s     Convert main inage to (gif|png|jpg)\n";
+    print STDERR "   -minimumsize n   Ignore images smaller than n bytes\n";
     print STDERR "\n";
 }
@@ -55 +57 @@
              q^converttotype/.*/^, \$self->{'converttotype'},
              q^thumbnailsize/[0-9]*/100^, \$self->{'thumbnailsize'},
+             q^minimumsize/[0-9]*/100^, \$self->{'minimumsize'},
              "allow_extra_options")) {
     
@@ -69 +72 @@
     my $self = shift (@_);
 
-    return q^(?i)(\.jpe?g|\.gif|\.png|\.bmp|\.tiff?)$^; 
+    return q^(?i)(\.jpe?g|\.gif|\.png|\.bmp|\.xbm|\.tif?f)$^; 
 }
 
@@ -82 +85 @@
     return "";
     }
-    if ($filename =~ m/thumbnail/) {
+#    if ($filename =~ m/thumbnail/) {
+#   return "";
+#    }
+#    if ($filename =~ m/converted/) {
+#   return "";
+#    }
+    if ($filename =~ m/ /) {
+    print STDERR "IamgePlug: \"$filename\" contains a space. choking.\n";
     return "";
     }
-    if ($filename =~ m/converted/) {
-    return "";
-    }
-    if ($filename =~ m/\..*\./) {
-    return "";
-    }
-
+
+    my $minimumsize = $self->{'minimumsize'};
     my $thumbSize = $self->{'thumbnailsize'};
     if ($thumbSize eq "") { $thumbSize = 100; };
@@ -101 +106 @@
     
     my $type = "unknown";
-    
+
+    if (defined $minimumsize && (-s $filename < $minimumsize)) {
+        print STDERR "ImagePlug: \"$filename\" too small, skipping\n"
+        if $self->{'verbosity'} > 1;
+    }
     #see if we need to convert ...
-    if ($converttotype ne "" && $filename =~ m/$converttotype$/)
-    {
+    if ($converttotype ne "" && $filename =~ m/$converttotype$/) {
     $originalfilename = $filename;
     $filename = &util::get_tmp_filename();
@@ -137 +145 @@
         if $self->{'verbosity'} > 3;
     
-    if ($result =~ m/=>.* ([0-9]+)x([0-9]+)=>([0-9]+)x([0-9]+)/m) {
+    if ($result =~ m/([0-9]+)x([0-9]+)=>([0-9]+)x([0-9]+)/) {
     $doc_obj->add_metadata ($section, "ImageHeight", $1);
     $doc_obj->add_metadata ($section, "ImageWidth", $2);
@@ -167 +175 @@
     $type = "bmp";
     }
-    
+    if ($result =~ m/^[^\n]*XBM?F/i) {
+    $type = "xbm";
+    }
+
     #if there's a leading directory name, eat it...
     $file =~ s/^[^\/\\]*[\/\\]//;
@@ -209 +220 @@
 
     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) {
     return undef;
     }
-    my $plugin_name = ref ($self);
+    print STDERR "ImagePlug: called on \"$filename\"\n"
+        if $self->{'verbosity'} > 1;
+
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
     
@@ -222 +233 @@
     
     #run convert to get the thumbnail and extract size and type info
-    my $thumbnailfile = run_convert($self, $filename, $file, $doc_obj);
-    
-    if (!defined $thumbnailfile)
+    my $result = run_convert($self, $filename, $file, $doc_obj);
+    
+    if (!defined $result)
     {
     print "ImagePlug: couldn't process \"$filename\"\n";
@@ -261 +272 @@
     }
 
-    return 1; # processed the file
+    return $result; # processed the file
 }