Assorted infobox bugfixing.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 9a3d31cc34e9eecaf737315285d3b232b6346eab..027268a2c469faeeb2b5d232d91e619753a8b341 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -218,10 +218,12 @@ sub get_cache_location {
        my ($r, $id, $width, $height, $infobox) = @_;
         my $dir = POSIX::floor($id / 256);
 
-       if ($infobox) {
+       if ($infobox eq 'both') {
                return get_base($r) . "cache/$dir/$id-$width-$height.jpg";
-       } else {
+       } elsif ($infobox eq 'nobox') {
                return get_base($r) . "cache/$dir/$id-$width-$height-nobox.jpg";
+       } else {
+               return get_base($r) . "cache/$dir/$id-$width-$height-box.png";
        }
 }
 
@@ -419,7 +421,7 @@ sub make_mipmap {
 
                push @mmlist, [ $mmwidth, $mmheight ];
        }
-
+               
        # Ensure that all of them are OK
        my $last_good_mmlocation;
        for my $i (0..$#mmlist) {
@@ -461,6 +463,9 @@ sub make_mipmap {
                }
        }
 
+       if (!defined($img)) {
+               $img = read_original_image($r, $id, $dbwidth, $dbheight);
+       }
        return $img;
 }
 
@@ -525,8 +530,10 @@ sub ensure_cached {
        my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
 
        my $fname = get_disk_location($r, $id);
-       unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
-               return ($fname, 0);
+       if ($infobox ne 'box') {
+               unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+                       return ($fname, undef);
+               }
        }
 
        my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
@@ -538,6 +545,50 @@ sub ensure_cached {
                        $r->log->warn("In overload mode, not scaling $id to $xres x $yres");
                        error($r, 'System is in overload mode, not doing any scaling');
                }
+
+               # If we're being asked for just the box, make a new image with just the box.
+               # We don't care about @otherres since each of these images are
+               # already pretty cheap to generate, but we need the exact width so we can make
+               # one in the right size.
+               if ($infobox eq 'box') {
+                       my ($img, $width, $height);
+
+                       # This is slow, but should fortunately almost never happen, so don't bother
+                       # special-casing it.
+                       if (!defined($dbwidth) || !defined($dbheight)) {
+                               $img = read_original_image($r, $id, $dbwidth, $dbheight);
+                               $width = $img->Get('columns');
+                               $height = $img->Get('rows');
+                               @$img = ();
+                       } else {
+                               $img = Image::Magick->new;
+                               $width = $dbwidth;
+                               $height = $dbheight;
+                       }
+                       
+                       if (defined($xres) && defined($yres)) {
+                               ($width, $height) = scale_aspect($width, $height, $xres, $yres);
+                       }
+                       $height = 24;
+                       $img->Set(size=>($width . "x" . $height));
+                       $img->Read('xc:white');
+                               
+                       my $info = Image::ExifTool::ImageInfo($fname);
+                       if (!make_infobox($img, $info, $r)) {
+                               # Not enough room for the text, make a tiny dummy transparent infobox
+                               @$img = ();
+                               $img->Set(size=>"1x1");
+                               $img->Read('null:');
+
+                               $width = 1;
+                               $height = 1;
+                       }
+                               
+                       $err = $img->write(filename => $cachename);
+                       $r->log->info("New infobox cache: $width x $height for $id.jpg");
+                       
+                       return ($cachename, 'image/png');
+               }
        
                my $img = make_mipmap($r, $fname, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
 
@@ -573,7 +624,7 @@ sub ensure_cached {
                                $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
                        }
 
-                       if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox == 1) {
+                       if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox ne 'nobox') {
                                my $info = Image::ExifTool::ImageInfo($fname);
                                make_infobox($cimg, $info, $r);
                        }
@@ -613,7 +664,7 @@ sub ensure_cached {
                        }
                }
        }
-       return ($cachename, 1);
+       return ($cachename, 'image/jpeg');
 }
 
 sub get_mimetype_from_filename {
@@ -638,7 +689,7 @@ sub make_infobox {
                $info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
 
        my @classic_fields = ();
-       if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
+       if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) {
                push @classic_fields, [ $1 . "mm", 0 ];
        } elsif (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)\/(\d+)$/) {
                push @classic_fields, [ (sprintf "%.1fmm", ($1/$2)), 0 ];
@@ -735,7 +786,7 @@ sub make_infobox {
                }
        }
 
-       return if (scalar @parts == 0);
+       return 0 if (scalar @parts == 0);
 
        # Find the required width
        my $th = 0;
@@ -755,7 +806,7 @@ sub make_infobox {
                $th = $h if ($h > $th);
        }
 
-       return if ($tw > $img->Get('columns'));
+       return 0 if ($tw > $img->Get('columns'));
 
        my $x = 0;
        my $y = $img->Get('rows') - 24;
@@ -784,6 +835,8 @@ sub make_infobox {
                $img->Annotate(text=>$part->[0], font=>$font, pointsize=>12, x=>int($x), y=>int($y));
                $x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12))[4];
        }
+
+       return 1;
 }
 
 sub gcd {