# 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: $!";
}
}
# 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);
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 {
$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)) {
# 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;
$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);
}
}
}
+
+ # 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');
}
$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
- $dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
- undef, $r->get_server_name, $event);
Sesse::pr0n::Common::purge_cache($r, "/$event/");
# Now save the file to disk
eval {
$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
- $dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
- undef, $r->get_server_name, $event);
# Now save the file to disk
$fname = Sesse::pr0n::Common::get_disk_location($r, $newid);