Split out the cache generation from the up-to-date testing.

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

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 72be2184d99a84bcc9245939a791ffa488cc6b9e..f071afcf838bf8a4425a5b46632bb8c1ac00cc06 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -207,20 +207,20 @@ sub get_dbh {
 
 sub get_disk_location {
        my ($r, $id) = @_;
-        my $dir = POSIX::floor($id / 256);
+       my $dir = POSIX::floor($id / 256);
        return $Sesse::pr0n::Config::image_base . "images/$dir/$id.jpg";
 }
 
 sub get_cache_location {
        my ($id, $width, $height) = @_;
-        my $dir = POSIX::floor($id / 256);
+       my $dir = POSIX::floor($id / 256);
 
        return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.jpg";
 }
 
 sub get_infobox_cache_location {
        my ($id, $width, $height, $dpr) = @_;
-        my $dir = POSIX::floor($id / 256);
+       my $dir = POSIX::floor($id / 256);
 
        if ($dpr == 1) {
                return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box.png";
@@ -248,7 +248,7 @@ sub ensure_disk_location_exists {
 
 sub get_mipmap_location {
        my ($r, $id, $width, $height) = @_;
-        my $dir = POSIX::floor($id / 256);
+       my $dir = POSIX::floor($id / 256);
 
        return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-mipmap-$width-$height.jpg";
 }
@@ -574,15 +574,12 @@ sub read_original_image {
 sub ensure_cached {
        my ($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
 
-       my ($new_dbwidth, $new_dbheight);
-
        my $fname = get_disk_location($r, $id);
        unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
                return ($fname, undef);
        }
 
        my $cachename = get_cache_location($id, $xres, $yres);
-       my $err;
        if (! -r $cachename or (-M $cachename > -M $fname)) {
                # If we are in overload mode (aka Slashdot mode), refuse to generate
                # new thumbnails.
@@ -591,77 +588,83 @@ sub ensure_cached {
                        error($r, 'System is in overload mode, not doing any scaling');
                }
 
-               my $img;
-               ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
-
-               while (defined($xres) && defined($yres)) {
-                       my ($nxres, $nyres) = (shift @otherres, shift @otherres);
-                       my $cachename = get_cache_location($id, $xres, $yres);
-                       
-                       my $cimg;
-                       if (defined($nxres) && defined($nyres)) {
-                               # we have more resolutions to scale, so don't throw
-                               # the image away
-                               $cimg = $img->Clone();
-                       } else {
-                               $cimg = $img;
-                       }
-               
-                       my $width = $img->Get('columns');
-                       my $height = $img->Get('rows');
-                       my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
+               make_cache($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
+       }
 
-                       my $filter = 'Lanczos';
-                       my $quality = 87;
-                       my $sf = "1x1";
+       return ($cachename, 'image/jpeg');
+}
 
-                       if ($xres != -1) {
-                               $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
-                       }
+sub make_cache {
+       my ($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
 
-                       # Strip EXIF tags etc.
-                       $cimg->Strip();
+       my ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
 
-                       {
-                               my %parms = (
-                                       filename => $cachename,
-                                       quality => $quality
-                               );
-                               if (($nwidth >= 640 && $nheight >= 480) ||
-                                   ($nwidth >= 480 && $nheight >= 640)) {
-                                       $parms{'interlace'} = 'Plane';
-                               }
-                               if (defined($sf)) {
-                                       $parms{'sampling-factor'} = $sf;
-                               }
-                               $err = $cimg->write(%parms);
-                       }
+       # Update the SQL database if it doesn't contain the required info
+       if (!defined($dbwidth) && defined($new_dbwidth)) {
+               log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight");
+               update_image_info($r, $id, $new_dbwidth, $new_dbheight);
+       }
 
-                       undef $cimg;
+       my $err;
+       while (defined($xres) && defined($yres)) {
+               my ($nxres, $nyres) = (shift @otherres, shift @otherres);
+               my $cachename = get_cache_location($id, $xres, $yres);
+               
+               my $cimg;
+               if (defined($nxres) && defined($nyres)) {
+                       # we have more resolutions to scale, so don't throw
+                       # the image away
+                       $cimg = $img->Clone();
+               } else {
+                       $cimg = $img;
+               }
+       
+               my $width = $img->Get('columns');
+               my $height = $img->Get('rows');
+               my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
 
-                       ($xres, $yres) = ($nxres, $nyres);
+               my $filter = 'Lanczos';
+               my $quality = 87;
+               my $sf = "1x1";
 
-                       log_info($r, "New cache: $nwidth x $nheight for $id.jpg");
+               if ($xres != -1) {
+                       $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
                }
-               
-               undef $img;
-               if ($err) {
-                       log_warn($r, "$fname: $err");
-                       $err =~ /(\d+)/;
-                       if ($1 >= 400) {
-                               #@$magick = ();
-                               error($r, "$fname: $err");
+
+               # Strip EXIF tags etc.
+               $cimg->Strip();
+
+               {
+                       my %parms = (
+                               filename => $cachename,
+                               quality => $quality
+                       );
+                       if (($nwidth >= 640 && $nheight >= 480) ||
+                           ($nwidth >= 480 && $nheight >= 640)) {
+                               $parms{'interlace'} = 'Plane';
                        }
+                       if (defined($sf)) {
+                               $parms{'sampling-factor'} = $sf;
+                       }
+                       $err = $cimg->write(%parms);
                }
+
+               undef $cimg;
+
+               ($xres, $yres) = ($nxres, $nyres);
+
+               log_info($r, "New cache: $nwidth x $nheight for $id.jpg");
        }
        
-       # Update the SQL database if it doesn't contain the required info
-       if (!defined($dbwidth) && defined($new_dbwidth)) {
-               log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight");
-               update_image_info($r, $id, $new_dbwidth, $new_dbheight);
+       undef $img;
+       if ($err) {
+               log_warn($r, "$filename: $err");
+               $err =~ /(\d+)/;
+               if ($1 >= 400) {
+                       #@$magick = ();
+                       error($r, "$filename: $err");
+               }
        }
-
-       return ($cachename, 'image/jpeg');
 }
 
 sub ensure_infobox_cached {