X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=6c3d7e4110545bb2ac4d43c908df2cf0e0b7865b;hp=6fb5536f5911e312034042b57a1f73f379bef3b3;hb=f9ff3e7edda055056a4de903d4b959f8fa1c2542;hpb=6be9a26e71fc85e69cbbdbc95fc50d3569050921

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 6fb5536..6c3d7e4 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -24,6 +24,7 @@ use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
 use HTML::Entities;
+use URI::Escape;
 
 BEGIN {
 	use Exporter ();
@@ -34,7 +35,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.40";
+	$VERSION     = "v2.41";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -129,6 +130,8 @@ sub get_query_string {
 	while (my ($key, $value) = each %$param) {
 		next unless defined($value);
 		next if (defined($defparam->{$key}) && $value == $defparam->{$key});
+
+		$value = pretty_escape($value);
 	
 		$str .= ($first) ? "?" : ';';
 		$str .= "$key=$value";
@@ -136,6 +139,18 @@ sub get_query_string {
 	}
 	return $str;
 }
+		
+sub pretty_escape {
+	my $value = shift;
+
+	$value = URI::Escape::uri_escape($value);
+
+	# Unescape a few for prettiness (we'll need something for a real _, though)
+	$value =~ s/%20/_/g;
+	$value =~ s/%2F/\//g;
+
+	return $value;
+}
 
 sub print_link {
 	my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
@@ -188,7 +203,9 @@ sub update_image_info {
 	my ($r, $id, $width, $height) = @_;
 
 	# Also find the date taken if appropriate (from the EXIF tag etc.)
-	my $info = Image::ExifTool::ImageInfo(get_disk_location($r, $id));
+	my $exiftool = Image::ExifTool->new;
+	$exiftool->ExtractInfo(get_disk_location($r, $id));
+	my $info = $exiftool->GetInfo();
 	my $datetime = undef;
 			
 	if (defined($info->{'DateTimeOriginal'})) {
@@ -205,11 +222,12 @@ sub update_image_info {
 			 undef, $width, $height, $datetime, $id)
 			or die "Couldn't update width/height in SQL: $!";
 
+		# EXIF information
 		$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 (?,?,?)')
+		my $q = $dbh->prepare('INSERT INTO exif_info (image,key,value) VALUES (?,?,?)')
 			or die "Couldn't prepare inserting EXIF information: $!";
 
 		for my $key (keys %$info) {
@@ -218,6 +236,20 @@ sub update_image_info {
 				or die "Couldn't insert EXIF information in database: $!";
 		}
 
+		# Tags
+		my @tags = $exiftool->GetValue('Keywords', 'ValueConv');
+		$dbh->do('DELETE FROM tags WHERE image=?',
+			undef, $id)
+			or die "Couldn't delete old tag information in SQL: $!";
+
+		my $q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)')
+			or die "Couldn't prepare inserting tag information: $!";
+
+		for my $tag (@tags) {
+			$q->execute($id, guess_charset($tag))
+				or die "Couldn't insert tag 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=?)',
@@ -314,11 +346,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 +407,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 +426,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;