X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=63190b14295aadc1d10df6d19d0480cd5e672eec;hp=d85ce6aa896508923424d1c699551badfee9b138;hb=060aaacf0d15a03ed7287cf81169f630a1a1f95b;hpb=d0e9a452e8354fe827162ad367b4bf5bf2f76ff2

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index d85ce6a..63190b1 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -19,7 +19,7 @@ use DBD::Pg;
 use Image::Magick;
 use POSIX;
 use Digest::MD5;
-use Digest::SHA1;
+use Digest::SHA;
 use Digest::HMAC_SHA1;
 use MIME::Base64;
 use MIME::Types;
@@ -39,7 +39,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.70";
+	$VERSION     = "v2.80";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -211,7 +211,7 @@ sub get_base {
 	my $r = shift;
 	return $r->dir_config('ImageBase');
 }
-
+				
 sub get_disk_location {
 	my ($r, $id) = @_;
         my $dir = POSIX::floor($id / 256);
@@ -231,6 +231,23 @@ sub get_cache_location {
 	}
 }
 
+sub ensure_disk_location_exists {
+	my ($r, $id) = @_;
+	my $dir = POSIX::floor($id / 256);
+
+	my $img_dir = get_base($r) . "/images/$dir/";
+	if (! -d $img_dir) {
+		$r->log->info("Need to create new image directory $img_dir");
+		mkdir($img_dir) or die "Couldn't create new image directory $img_dir";
+	}
+
+	my $cache_dir = get_base($r) . "/cache/$dir/";
+	if (! -d $cache_dir) {
+		$r->log->info("Need to create new cache directory $cache_dir");
+		mkdir($cache_dir) or die "Couldn't create new image directory $cache_dir";
+	}
+}
+
 sub get_mipmap_location {
 	my ($r, $id, $width, $height) = @_;
         my $dir = POSIX::floor($id / 256);
@@ -291,6 +308,10 @@ sub update_image_info {
 		
 		# Tags
 		my @tags = $exiftool->GetValue('Keywords', 'ValueConv');
+		if (scalar @tags == 0) {
+			# This is XMP-dc:Subject, an RDF bag of tags.
+			@tags = $exiftool->GetValue('Subject', 'ValueConv');
+		}
 		$dbh->do('DELETE FROM tags WHERE image=?',
 			undef, $id)
 			or die "Couldn't delete old tag information in SQL: $!";
@@ -306,7 +327,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 (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)',
+		$dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?),last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)',
 			undef, $datetime, $id)
 			or die "Couldn't update last_picture in SQL: $!";
 	}
@@ -338,18 +359,19 @@ sub output_401 {
 	$r->status(401);
 	$r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"';
 
-	if ($options{'DigestAuth'} // 1) {
+	# Digest auth is disabled for now, due to various client problems.
+	if (0 && ($options{'DigestAuth'} // 1)) {
 		# We make our nonce similar to the scheme of RFC2069 section 2.1.1,
 		# with some changes: We don't care about client IP (these have a nasty
 		# tendency to change from request to request when load-balancing
 		# proxies etc. are being used), and we use HMAC instead of simple
 		# hashing simply because that's a better signing method.
 		#
-		# NOTE: For some weird reason, Digest::HMAC_SHA1 doesn't like taking
+		# NOTE: For some weird reason, Digest::HMAC_SHA doesn't like taking
 		# the output from time directly (it gives a different response), so we
 		# forcefully stringify the argument.
 		my $ts = time;
-		my $nonce = Digest::HMAC_SHA1->hmac_sha1_hex($ts . "", $Sesse::pr0n::Config::db_password);
+		my $nonce = Digest::HMAC_SHA->hmac_sha1_hex($ts . "", $Sesse::pr0n::Config::db_password);
 		my $stale_nonce_text = "";
 		$stale_nonce_text = ", stale=\"true\"" if ($options{'StaleNonce'} // 0);
 
@@ -371,7 +393,7 @@ sub check_basic_auth {
 	
 	my $ref = $dbh->selectrow_hashref('SELECT sha1password,digest_ha1_hex FROM users WHERE username=? AND vhost=?',
 		undef, $user, $r->get_server_name);
-	if (!defined($ref) || $ref->{'sha1password'} ne Digest::SHA1::sha1_base64($pass)) {
+	if (!defined($ref) || $ref->{'sha1password'} ne Digest::SHA::sha1_base64($pass)) {
 		$r->content_type('text/plain; charset=utf-8');
 		$r->log->warn("Authentication failed for $user/$takenby");
 		output_401($r);
@@ -531,7 +553,8 @@ sub stat_image_from_id {
 }
 
 # Takes in an image ID and a set of resolutions, and returns (generates if needed)
-# the smallest mipmap larger than the largest of them.
+# the smallest mipmap larger than the largest of them, as well as the original image
+# dimensions.
 sub make_mipmap {
 	my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, @res) = @_;
 	my ($img, $mmimg, $width, $height);
@@ -629,8 +652,10 @@ sub make_mipmap {
 
 	if (!defined($img)) {
 		$img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+		$width = $img->Get('columns');
+		$height = $img->Get('rows');
 	}
-	return $img;
+	return ($img, $width, $height);
 }
 
 sub read_original_image {
@@ -682,30 +707,23 @@ sub read_original_image {
 
 	# If we use ->[0] unconditionally, text rendering (!) seems to crash
 	my $img;
-	if (ref($magick)) {
+	if (ref($magick) !~ /Image::Magick/) {
 		$img = $magick;
 	} else {
 		$img = (scalar @$magick > 1) ? $magick->[0] : $magick;
 	}
 
-	my $width = $img->Get('columns');
-	my $height = $img->Get('rows');
-
-	# Update the SQL database if it doesn't contain the required info
-	if (!defined($dbwidth) || !defined($dbheight)) {
-		$r->log->info("Updating width/height for $id: $width x $height");
-		update_image_info($r, $id, $width, $height);
-	}
-
 	return $img;
 }
 
 sub ensure_cached {
 	my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
 
+	my ($new_dbwidth, $new_dbheight);
+
 	my $fname = get_disk_location($r, $id);
 	if ($infobox ne 'box') {
-		unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+		unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
 			return ($fname, undef);
 		}
 	}
@@ -731,8 +749,8 @@ sub ensure_cached {
 			# special-casing it.
 			if (!defined($dbwidth) || !defined($dbheight)) {
 				$img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, 0);
-				$width = $img->Get('columns');
-				$height = $img->Get('rows');
+				$new_dbwidth = $width = $img->Get('columns');
+				$new_dbheight = $height = $img->Get('rows');
 				@$img = ();
 			} else {
 				$img = Image::Magick->new;
@@ -776,7 +794,8 @@ sub ensure_cached {
 			$can_use_qscale = 1;
 		}
 
-		my $img = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, $xres, $yres, @otherres);
+		my $img;
+		($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, $xres, $yres, @otherres);
 
 		while (defined($xres) && defined($yres)) {
 			my ($nxres, $nyres) = (shift @otherres, shift @otherres);
@@ -795,16 +814,9 @@ sub ensure_cached {
 			my $height = $img->Get('rows');
 			my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
 
-			# 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 = 85;
-				$sf = "1x1";
-			}
+			my $filter = 'Lanczos';
+			my $quality = 87;
+			my $sf = "1x1";
 
 			if ($xres != -1) {
 				$cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
@@ -850,6 +862,13 @@ sub ensure_cached {
 			}
 		}
 	}
+	
+	# Update the SQL database if it doesn't contain the required info
+	if (!defined($dbwidth) && defined($new_dbwidth)) {
+		$r->log->info("Updating width/height for $id: $new_dbwidth x $new_dbheight");
+		update_image_info($r, $id, $new_dbwidth, $new_dbheight);
+	}
+
 	return ($cachename, 'image/jpeg');
 }
 
@@ -869,10 +888,14 @@ sub make_infobox {
 	# fields"; note the comma separation. Every field has an associated "bold flag"
 	# in the second part.
 	
-	my $shutter_priority = (defined($info->{'ExposureProgram'}) &&
+	my $manual_shutter = (defined($info->{'ExposureProgram'}) &&
 		$info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
-	my $aperture_priority = (defined($info->{'ExposureProgram'}) &&
+	my $manual_aperture = (defined($info->{'ExposureProgram'}) &&
 		$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
+	if ($info->{'ExposureProgram'} =~ /manual/i) {
+		$manual_shutter = 1;
+		$manual_aperture = 1;
+	}
 
 	my @classic_fields = ();
 	if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) {
@@ -884,24 +907,24 @@ sub make_infobox {
 	if (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)\/(\d+)$/) {
 		my ($a, $b) = ($1, $2);
 		my $gcd = gcd($a, $b);
-		push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $shutter_priority ];
-	} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) {
-		push @classic_fields, [ $1 . "s", $shutter_priority ];
+		push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $manual_shutter ];
+	} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+)?)$/) {
+		push @classic_fields, [ $1 . "s", $manual_shutter ];
 	}
 
 	if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
 		my $f = $1/$2;
 		if ($f >= 10) {
-			push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.0f", $f), $manual_aperture ];
 		} else {
-			push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.1f", $f), $manual_aperture ];
 		}
 	} elsif (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\.(\d+)$/) {
 		my $f = $info->{'FNumber'};
 		if ($f >= 10) {
-			push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.0f", $f), $manual_aperture ];
 		} else {
-			push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
+			push @classic_fields, [ (sprintf "f/%.1f", $f), $manual_aperture ];
 		}
 	}
 
@@ -921,7 +944,7 @@ sub make_infobox {
 
 	if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
 		push @classic_fields, [ $info->{'ExposureBiasValue'} . " EV", 0 ];
-	} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
+	} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} ne "0") {
 		push @classic_fields, [ $info->{'ExposureCompensation'} . " EV", 0 ];
 	}
 
@@ -1098,8 +1121,6 @@ sub purge_cache {
 	}
 	$regex .= "(\\?.*)?\$";
 	$r->headers_out->{'X-Pr0n-Purge'} = $regex;
-
-	$r->log->info($r->headers_out->{'X-Pr0n-Purge'});
 }
 				
 # Find a list of all cache URLs for a given image, given what we have on disk.
@@ -1128,6 +1149,8 @@ sub get_all_cache_urls {
 			push @ret, "/$event/$1x$2/$filename";
 		} elsif ($fname =~ /^$id-(\d+)-(\d+)-nobox\.jpg$/) {
 			push @ret, "/$event/$1x$2/nobox/$filename";
+		} elsif ($fname =~ /^$id--1--1-box\.png$/) {
+			push @ret, "/$event/box/$filename";
 		} elsif ($fname =~ /^$id-(\d+)-(\d+)-box\.png$/) {
 			push @ret, "/$event/$1x$2/box/$filename";
 		} else {