X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=a9ee2119db8751d3c97770f5cb6f7aa68f9864e0;hp=ad905d1e5d6f03e6563d6512ecee8213e4d951f2;hb=9b45ad1ecd9f1eace384f825a7dc6b2b7920af65;hpb=e96ef46cf8ad5cb95c12abf6ee20ed95ae2f111c

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index ad905d1..a9ee211 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -39,7 +39,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.71";
+	$VERSION     = "v2.72";
 	@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);
@@ -306,7 +323,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: $!";
 	}
@@ -532,7 +549,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);
@@ -630,8 +648,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 {
@@ -689,21 +709,14 @@ sub read_original_image {
 		$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 < $dbwidth || $yres < $dbheight || $xres == -1)) {
@@ -732,8 +745,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;
@@ -777,7 +790,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);
@@ -844,6 +858,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');
 }