X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=024d220f4628dd39df35a4deeb8cd5d2b3efd8a6;hb=6aab2b85ef880b18dc8f1a575d477f942db7c58b;hp=1f1eac878537ebaffcfdb4e0c54187d0bfdf1841;hpb=aebd301b01c9b4e75e382fb7c1fcb9347c48ffd0;p=pr0n

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 1f1eac8..024d220 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.21";
+	$VERSION     = "v2.41";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -91,7 +91,7 @@ sub header {
 		$quote = LWP::Simple::get("http://itk.samfundet.no/include/quotes.cli.php");
 		$quote = "Error: Could not fetch quotes." if (!defined($quote));
 	}
-	Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => $quote });
+	Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => Encode::decode_utf8($quote) });
 }
 
 sub footer {
@@ -184,7 +184,7 @@ sub get_cache_location {
 	}
 }
 
-sub update_width_height {
+sub update_image_info {
 	my ($r, $id, $width, $height) = @_;
 
 	# Also find the date taken if appropriate (from the EXIF tag etc.)
@@ -198,15 +198,32 @@ sub update_width_height {
 		}
 	}
 
-	$dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
-		 undef, $width, $height, $datetime, $id)
-		or die "Couldn't update width/height in SQL: $!";
+	{
+		local $dbh->{AutoCommit} = 0;
 
-	# 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=?)',
-		undef, $datetime, $id)
-		or die "Couldn't update last_picture in SQL: $!";
+		$dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
+			 undef, $width, $height, $datetime, $id)
+			or die "Couldn't update width/height in SQL: $!";
+
+		$dbh->do('DELETE FROM exif_info WHERE image=?',
+			undef, $id)
+			or die "Couldn't delete old EXIF information in SQL: $!";
+
+		my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)')
+			or die "Couldn't prepare inserting EXIF information: $!";
+
+		for my $key (keys %$info) {
+			next if ref $info->{$key};
+			$q->execute($id, $key, guess_charset($info->{$key}))
+				or die "Couldn't insert EXIF information in database: $!";
+		}
+
+		# 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 (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)',
+			undef, $datetime, $id)
+			or die "Couldn't update last_picture in SQL: $!";
+	}
 }
 
 sub check_access {
@@ -297,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+)/;
@@ -320,7 +349,7 @@ sub ensure_cached {
 		# Update the SQL database if it doesn't contain the required info
 		if ($dbwidth == -1 || $dbheight == -1) {
 			$r->log->info("Updating width/height for $id: $width x $height");
-			update_width_height($r, $id, $width, $height);
+			update_image_info($r, $id, $width, $height);
 		}
 			
 		# We always want RGB JPEGs
@@ -346,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) {
@@ -363,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;
@@ -427,6 +466,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;
@@ -452,7 +493,11 @@ sub make_infobox {
 		push @classic_fields, $info->{'ISOSetting'} . " ISO";
 	}
 
-	push @classic_fields, $info->{'ExposureBiasValue'} . " EV" if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0);
+	if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) {
+		push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
+	} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
+		push @classic_fields, $info->{'ExposureCompensation'} . " EV";
+	}
 	
 	if (scalar @classic_fields > 0) {
 		push @lines, join(', ', @classic_fields);
@@ -550,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 ();