use strict;
use warnings;
-use Sesse::pr0n::Templates;
use Sesse::pr0n::Overload;
+use Sesse::pr0n::QscaleProxy;
+use Sesse::pr0n::Templates;
use Apache2::RequestRec (); # for $r->content_type
use Apache2::RequestIO (); # for $r->print
use Image::ExifTool;
use HTML::Entities;
use URI::Escape;
+use File::Basename;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.60";
+ $VERSION = "v2.70";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
# Takes in an image ID and a set of resolutions, and returns (generates if needed)
# the smallest mipmap larger than the largest of them.
sub make_mipmap {
- my ($r, $filename, $id, $dbwidth, $dbheight, @res) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, @res) = @_;
my ($img, $mmimg, $width, $height);
+
+ my $physical_fname = get_disk_location($r, $id);
# If we don't know the size, we'll need to read it in anyway
if (!defined($dbwidth) || !defined($dbheight)) {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
$width = $img->Get('columns');
$height = $img->Get('rows');
} else {
my $large_enough = 1;
for my $i (0..($#res/2)) {
my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
- if ($xres > $new_mmwidth || $yres > $new_mmheight) {
+ if ($xres == -1 || $xres > $new_mmwidth || $yres > $new_mmheight) {
$large_enough = 0;
last;
}
my $mmres = $mmlist[$i];
my $mmlocation = get_mipmap_location($r, $id, $mmres->[0], $mmres->[1]);
- if (! -r $mmlocation or (-M $mmlocation > -M $filename)) {
+ if (! -r $mmlocation or (-M $mmlocation > -M $physical_fname)) {
if (!defined($img)) {
if (defined($last_good_mmlocation)) {
- $img = Image::Magick->new;
+ if ($can_use_qscale) {
+ $img = Sesse::pr0n::QscaleProxy->new;
+ } else {
+ $img = Image::Magick->new;
+ }
$img->Read($last_good_mmlocation);
} else {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
}
}
my $cimg;
$cimg = $img->Clone();
}
$r->log->info("Making mipmap for $id: " . $mmres->[0] . " x " . $mmres->[1]);
- $cimg->Resize(width=>$mmres->[0], height=>$mmres->[1], filter=>'Lanczos');
+ $cimg->Resize(width=>$mmres->[0], height=>$mmres->[1], filter=>'Lanczos', 'sampling-factor'=>'1x1');
$cimg->Strip();
my $err = $cimg->write(
filename => $mmlocation,
}
if ($last && !defined($img)) {
# OK, read in the smallest one
- $img = Image::Magick->new;
+ if ($can_use_qscale) {
+ $img = Sesse::pr0n::QscaleProxy->new;
+ } else {
+ $img = Image::Magick->new;
+ }
my $err = $img->Read($mmlocation);
}
}
if (!defined($img)) {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
}
return $img;
}
sub read_original_image {
- my ($r, $id, $dbwidth, $dbheight) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale) = @_;
- my $fname = get_disk_location($r, $id);
+ my $physical_fname = get_disk_location($r, $id);
# Read in the original image
- my $magick = new Image::Magick;
+ my $magick;
+ if ($can_use_qscale && ($filename =~ /\.jpeg$/i || $filename =~ /\.jpg$/i)) {
+ $magick = Sesse::pr0n::QscaleProxy->new;
+ } else {
+ $magick = Image::Magick->new;
+ }
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 ($fname =~ /\.nef$/i) {
+ if ($filename =~ /\.(nef|cr2)$/i) {
# this would suffice if ImageMagick gets to fix their handling
- # $fname = "NEF:$fname";
+ # $physical_fname = "NEF:$physical_fname";
- open DCRAW, "-|", "dcraw", "-w", "-c", $fname
+ open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname
or error("dcraw: $!");
$err = $magick->Read(file => \*DCRAW);
close(DCRAW);
#if (!$infobox) {
# $magick->Set(colorspace=>'YCbCr');
#}
- $err = $magick->Read($fname);
+ $err = $magick->Read($physical_fname);
}
if ($err) {
- $r->log->warn("$fname: $err");
+ $r->log->warn("$physical_fname: $err");
$err =~ /(\d+)/;
if ($1 >= 400) {
undef $magick;
- error($r, "$fname: $err");
+ error($r, "$physical_fname: $err");
}
}
# If we use ->[0] unconditionally, text rendering (!) seems to crash
- my $img = (scalar @$magick > 1) ? $magick->[0] : $magick;
+ my $img;
+ if (ref($magick)) {
+ $img = $magick;
+ } else {
+ $img = (scalar @$magick > 1) ? $magick->[0] : $magick;
+ }
my $width = $img->Get('columns');
my $height = $img->Get('rows');
# This is slow, but should fortunately almost never happen, so don't bother
# special-casing it.
if (!defined($dbwidth) || !defined($dbheight)) {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, 0);
$width = $img->Get('columns');
$height = $img->Get('rows');
@$img = ();
my $info = Image::ExifTool::ImageInfo($fname);
if (make_infobox($img, $info, $r)) {
$img->Quantize(colors=>16, dither=>'False');
+
+ # Since the image is grayscale, ImageMagick overrides us and writes this
+ # as grayscale anyway, but at least we get rid of the alpha channel this
+ # way.
+ $img->Set(type=>'Palette');
} else {
# Not enough room for the text, make a tiny dummy transparent infobox
@$img = ();
return ($cachename, 'image/png');
}
-
- my $img = make_mipmap($r, $fname, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
+
+ my $can_use_qscale = 0;
+ if ($infobox eq 'nobox') {
+ $can_use_qscale = 1;
+ }
+
+ my $img = 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);
}
if ($xres != -1) {
- $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
+ $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
}
if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox ne 'nobox') {
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+)$/) {
+ } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) {
push @classic_fields, [ $1 . "s", $shutter_priority ];
}
}
sub add_new_event {
- my ($dbh, $id, $date, $desc, $vhost) = @_;
+ my ($r, $dbh, $id, $date, $desc) = @_;
my @errors = ();
if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) {
return @errors;
}
+ my $vhost = $r->get_server_name;
$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 (vhost,event,last_picture) VALUES (?,?,NULL)",
undef, $vhost, $id)
or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr);
+ purge_cache($r, "/");
return ();
}
return $decoded;
}
+# Depending on your front-end cache, you might want to get creative somehow here.
+# This example assumes you have a front-end cache and it can translate an X-Pr0n-Purge
+# regex tacked onto a request into something useful. The elements given in
+# should not be regexes, though, as e.g. Squid will not be able to handle that.
+sub purge_cache {
+ my ($r, @elements) = @_;
+ return if (scalar @elements == 0);
+
+ my @pe = ();
+ for my $elem (@elements) {
+ $r->log->info("Purging $elem");
+ (my $e = $elem) =~ s/[.+*|()]/\\$&/g;
+ push @pe, $e;
+ }
+
+ my $regex = "^";
+ if (scalar @pe == 1) {
+ $regex .= $pe[0];
+ } else {
+ $regex .= "(" . join('|', @pe) . ")";
+ }
+ $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.
+sub get_all_cache_urls {
+ my ($r, $dbh, $id) = @_;
+ my $dir = POSIX::floor($id / 256);
+ my @ret = ();
+
+ my $q = $dbh->prepare('SELECT event, filename FROM images WHERE id=?')
+ or die "Couldn't prepare: " . $dbh->errstr;
+ $q->execute($id)
+ or die "Couldn't find event and filename: " . $dbh->errstr;
+ my $ref = $q->fetchrow_hashref;
+ my $event = $ref->{'event'};
+ my $filename = $ref->{'filename'};
+ $q->finish;
+
+ my $base = get_base($r) . "cache/$dir";
+ for my $file (<$base/$id-*>) {
+ my $fname = File::Basename::basename($file);
+ if ($fname =~ /^$id-mipmap-.*\.jpg$/) {
+ # Mipmaps don't have an URL, ignore
+ } elsif ($fname =~ /^$id--1--1\.jpg$/) {
+ push @ret, "/$event/$filename";
+ } elsif ($fname =~ /^$id-(\d+)-(\d+)\.jpg$/) {
+ push @ret, "/$event/$1x$2/$filename";
+ } elsif ($fname =~ /^$id-(\d+)-(\d+)-nobox\.jpg$/) {
+ push @ret, "/$event/$1x$2/nobox/$filename";
+ } elsif ($fname =~ /^$id-(\d+)-(\d+)-box\.png$/) {
+ push @ret, "/$event/$1x$2/box/$filename";
+ } else {
+ $r->log->warning("Couldn't find a purging URL for $fname");
+ }
+ }
+
+ return @ret;
+}
+
1;
projects / pr0n / blobdiff