Up the quality of the thumbnails again, but now also with larger scaling

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

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index c34aa65f1df96e3a01eaeeb6c837f686792d93b9..e446ca831969567ae788fc4289912df6fd4289d7 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -34,7 +34,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.30";
+       $VERSION     = "v2.40";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -220,7 +220,7 @@ sub update_image_info {
 
                # update the last_picture cache as well (this should of course be done
                # via a trigger, but this is less complicated :-) )
-               $dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE event=(SELECT event FROM images WHERE id=?)',
+               $dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)',
                        undef, $datetime, $id)
                        or die "Couldn't update last_picture in SQL: $!";
        }
@@ -314,11 +314,23 @@ sub ensure_cached {
                # Need to generate the cache; read in the image
                my $magick = new Image::Magick;
                my $info = Image::ExifTool::ImageInfo($fname);
-
-               # NEF files aren't autodetected
-               $fname = "NEF:$fname" if ($filename =~ /\.nef$/i);
+               my $err;
+
+               # ImageMagick can handle NEF files, but it does it by calling dcraw as a delegate.
+               # The delegate support is rather broken and causes very odd stuff to happen when
+               # more than one thread does this at the same time. Thus, we simply do it ourselves.
+               if ($filename =~ /\.nef$/) {
+                       # this would suffice if ImageMagick gets to fix their handling
+                       # $fname = "NEF:$fname";
+                       
+                       open DCRAW, "-|", "dcraw", "-w", "-c", $fname
+                               or error("dcraw: $!");
+                       $err = $magick->Read(file => \*DCRAW);
+                       close(DCRAW);
+               } else {
+                       $err = $magick->Read($fname);
+               }
                
-               my $err = $magick->Read($fname);
                if ($err) {
                        $r->log->warn("$fname: $err");
                        $err =~ /(\d+)/;
@@ -363,10 +375,12 @@ sub ensure_cached {
                        # Use lanczos (sharper) for heavy scaling, mitchell (faster) otherwise
                        my $filter = 'Mitchell';
                        my $quality = 90;
+                       my $sf = undef;
 
                        if ($width / $nwidth > 8.0 || $height / $nheight > 8.0) {
                                $filter = 'Lanczos';
-                               $quality = 80;
+                               $quality = 85;
+                               $sf = "1x1";
                        }
 
                        if ($xres != -1) {
@@ -380,11 +394,19 @@ sub ensure_cached {
                        # Strip EXIF tags etc.
                        $cimg->Strip();
 
-                       if (($nwidth >= 640 && $nheight >= 480) ||
-                           ($nwidth >= 480 && $nheight >= 640)) {
-                               $err = $cimg->write(filename=>$cachename, quality=>$quality, interlace=>'Plane');
-                       } else {
-                               $err = $cimg->write(filename=>$cachename, quality=>$quality);
+                       {
+                               my %parms = (
+                                       filename => $cachename,
+                                       quality => $quality
+                               );
+                               if (($nwidth >= 640 && $nheight >= 480) ||
+                                   ($nwidth >= 480 && $nheight >= 640)) {
+                                       $parms{'interlace'} = 'Plane';
+                               }
+                               if (defined($sf)) {
+                                       $parms{'scaling-factor'} = $sf;
+                               }
+                               $err = $cimg->write(%parms);
                        }
 
                        undef $cimg;
@@ -573,11 +595,11 @@ sub add_new_event {
                return @errors;
        }
                
-       $dbh->do("INSERT INTO events (id,date,name,vhost) VALUES (?,?,?,?)",
+       $dbh->do("INSERT INTO events (event,date,name,vhost) VALUES (?,?,?,?)",
                undef, $id, $date, $desc, $vhost)
                or return ("Kunne ikke sette inn ny hendelse" . $dbh->errstr);
-       $dbh->do("INSERT INTO last_picture_cache (event,last_picture) VALUES (?,NULL)",
-               undef, $id)
+       $dbh->do("INSERT INTO last_picture_cache (vhost,event,last_picture) VALUES (?,?,NULL)",
+               undef, $vhost, $id)
                or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr);
 
        return ();