X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=e12e8dc53efa85bba94a5a3221c37ab58025980f;hp=20dacfb49db4602bb711ccd89a844b0d532f4b6f;hb=fa10473159be03eb924e50cdb4688540c78f89b1;hpb=56429e6ffe41a5cd7eff61e7f770f956973f8a42

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 20dacfb..e12e8dc 100644
--- 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.41";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -129,6 +129,9 @@ sub get_query_string {
 	while (my ($key, $value) = each %$param) {
 		next unless defined($value);
 		next if (defined($defparam->{$key}) && $value == $defparam->{$key});
+
+		# FIXME: We'll need to escape _ here somehow
+		$value =~ s/ /_/g;
 	
 		$str .= ($first) ? "?" : ';';
 		$str .= "$key=$value";
@@ -220,7 +223,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 +317,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 +378,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 +397,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{'sampling-factor'} = $sf;
+				}
+				$err = $cimg->write(%parms);
 			}
 
 			undef $cimg;
@@ -444,6 +469,8 @@ sub make_infobox {
 		my ($a, $b) = ($1, $2);
 		my $gcd = gcd($a, $b);
 		push @classic_fields, ($a/$gcd . "/" . $b/$gcd . "s");
+	} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)$/) {
+		push @classic_fields, ($1 . "s");
 	}
 	if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
 		my $f = $1/$2;
@@ -571,11 +598,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 ();