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.51";
+ $VERSION = "v2.70";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
my ($r, $id, $width, $height, $infobox) = @_;
my $dir = POSIX::floor($id / 256);
- if ($infobox) {
+ if ($infobox eq 'both') {
return get_base($r) . "cache/$dir/$id-$width-$height.jpg";
- } else {
+ } elsif ($infobox eq 'nobox') {
return get_base($r) . "cache/$dir/$id-$width-$height-nobox.jpg";
+ } else {
+ return get_base($r) . "cache/$dir/$id-$width-$height-box.png";
}
}
+sub get_mipmap_location {
+ my ($r, $id, $width, $height) = @_;
+ my $dir = POSIX::floor($id / 256);
+
+ return get_base($r) . "cache/$dir/$id-mipmap-$width-$height.jpg";
+}
+
sub update_image_info {
my ($r, $id, $width, $height) = @_;
sub check_access {
my $r = shift;
+
+ #return qw(sesse Sesse);
my $auth = $r->headers_in->{'authorization'};
- if (!defined($auth) || $auth !~ m#^Basic ([a-zA-Z0-9+/]+=*)$#) {
- $r->content_type('text/plain; charset=utf-8');
- $r->status(401);
- $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"';
- $r->print("Need authorization\n");
+ if (!defined($auth)) {
+ output_401($r);
return undef;
}
-
- #return qw(sesse Sesse);
+ if ($auth =~ /^Basic ([a-zA-Z0-9+\/]+=*)$/) {
+ return check_basic_auth($r, $1);
+ }
+ output_401($r);
+ return undef;
+}
+
+sub output_401 {
+ my $r = shift;
+ $r->content_type('text/plain; charset=utf-8');
+ $r->status(401);
+ $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"';
+ $r->print("Need authorization\n");
+}
+
+sub check_basic_auth {
+ my ($r, $auth) = @_;
+
+ my ($user, $pass) = split /:/, MIME::Base64::decode_base64($auth);
- my ($user, $pass) = split /:/, MIME::Base64::decode_base64($1);
# WinXP is stupid :-)
if ($user =~ /^.*\\(.*)$/) {
$user = $1;
undef, $user, $pass, $r->get_server_name);
if ($ref->{'auth'} != 1) {
$r->content_type('text/plain; charset=utf-8');
- warn "No user exists, only $auth";
- $r->status(401);
- $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"';
- $r->print("Authorization failed");
$r->log->warn("Authentication failed for $user/$takenby");
+ output_401($r);
return undef;
}
return ($fname, $size, $mtime);
}
+# 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, $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, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ $width = $img->Get('columns');
+ $height = $img->Get('rows');
+ } else {
+ $width = $dbwidth;
+ $height = $dbheight;
+ }
+
+ # Generate the list of mipmaps
+ my @mmlist = ();
+
+ my $mmwidth = $width;
+ my $mmheight = $height;
+
+ while ($mmwidth > 1 || $mmheight > 1) {
+ my $new_mmwidth = POSIX::floor($mmwidth / 2);
+ my $new_mmheight = POSIX::floor($mmheight / 2);
+
+ $new_mmwidth = 1 if ($new_mmwidth < 1);
+ $new_mmheight = 1 if ($new_mmheight < 1);
+
+ my $large_enough = 1;
+ for my $i (0..($#res/2)) {
+ my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
+ if ($xres == -1 || $xres > $new_mmwidth || $yres > $new_mmheight) {
+ $large_enough = 0;
+ last;
+ }
+ }
+
+ last if (!$large_enough);
+
+ $mmwidth = $new_mmwidth;
+ $mmheight = $new_mmheight;
+
+ push @mmlist, [ $mmwidth, $mmheight ];
+ }
+
+ # Ensure that all of them are OK
+ my $last_good_mmlocation;
+ for my $i (0..$#mmlist) {
+ my $last = ($i == $#mmlist);
+ my $mmres = $mmlist[$i];
+
+ my $mmlocation = get_mipmap_location($r, $id, $mmres->[0], $mmres->[1]);
+ if (! -r $mmlocation or (-M $mmlocation > -M $physical_fname)) {
+ if (!defined($img)) {
+ if (defined($last_good_mmlocation)) {
+ 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, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ }
+ }
+ my $cimg;
+ if ($last) {
+ $cimg = $img;
+ } else {
+ $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', 'sampling-factor'=>'1x1');
+ $cimg->Strip();
+ my $err = $cimg->write(
+ filename => $mmlocation,
+ quality => 95,
+ 'sampling-factor' => '1x1'
+ );
+ $img = $cimg;
+ } else {
+ $last_good_mmlocation = $mmlocation;
+ }
+ if ($last && !defined($img)) {
+ # OK, read in the smallest one
+ 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, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ }
+ return $img;
+}
+
+sub read_original_image {
+ my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale) = @_;
+
+ my $physical_fname = get_disk_location($r, $id);
+
+ # Read in the original image
+ 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 ($filename =~ /\.(nef|cr2)$/i) {
+ # this would suffice if ImageMagick gets to fix their handling
+ # $physical_fname = "NEF:$physical_fname";
+
+ open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname
+ or error("dcraw: $!");
+ $err = $magick->Read(file => \*DCRAW);
+ close(DCRAW);
+ } else {
+ # We always want YCbCr JPEGs. Setting this explicitly here instead of using
+ # RGB is slightly faster (no colorspace conversion needed) and works equally
+ # well for our uses, as long as we don't need to draw an information box,
+ # which trickles several ImageMagick bugs related to colorspace handling.
+ # (Ideally we'd be able to keep the image subsampled and
+ # planar, but that would probably be difficult for ImageMagick to expose.)
+ #if (!$infobox) {
+ # $magick->Set(colorspace=>'YCbCr');
+ #}
+ $err = $magick->Read($physical_fname);
+ }
+
+ if ($err) {
+ $r->log->warn("$physical_fname: $err");
+ $err =~ /(\d+)/;
+ if ($1 >= 400) {
+ undef $magick;
+ error($r, "$physical_fname: $err");
+ }
+ }
+
+ # If we use ->[0] unconditionally, text rendering (!) seems to crash
+ 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');
+
+ # 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 $fname = get_disk_location($r, $id);
- unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $xres == -1)) {
- return ($fname, 0);
+ if ($infobox ne 'box') {
+ unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+ return ($fname, undef);
+ }
}
my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
+ my $err;
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
# new thumbnails.
$r->log->warn("In overload mode, not scaling $id to $xres x $yres");
error($r, 'System is in overload mode, not doing any scaling');
}
-
- # Need to generate the cache; read in the image
- my $magick = new Image::Magick;
- my $info = Image::ExifTool::ImageInfo($fname);
- 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$/i) {
- # this would suffice if ImageMagick gets to fix their handling
- # $fname = "NEF:$fname";
+
+ # If we're being asked for just the box, make a new image with just the box.
+ # We don't care about @otherres since each of these images are
+ # already pretty cheap to generate, but we need the exact width so we can make
+ # one in the right size.
+ if ($infobox eq 'box') {
+ my ($img, $width, $height);
+
+ # 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, $filename, $id, $dbwidth, $dbheight, 0);
+ $width = $img->Get('columns');
+ $height = $img->Get('rows');
+ @$img = ();
+ } else {
+ $img = Image::Magick->new;
+ $width = $dbwidth;
+ $height = $dbheight;
+ }
- open DCRAW, "-|", "dcraw", "-w", "-c", $fname
- or error("dcraw: $!");
- $err = $magick->Read(file => \*DCRAW);
- close(DCRAW);
- } else {
- $err = $magick->Read($fname);
- }
-
- if ($err) {
- $r->log->warn("$fname: $err");
- $err =~ /(\d+)/;
- if ($1 >= 400) {
- undef $magick;
- error($r, "$fname: $err");
+ if (defined($xres) && defined($yres)) {
+ ($width, $height) = scale_aspect($width, $height, $xres, $yres);
}
- }
-
- # If we use ->[0] unconditionally, text rendering (!) seems to crash
- my $img = (scalar @$magick > 1) ? $magick->[0] : $magick;
-
- my $width = $img->Get('columns');
- my $height = $img->Get('rows');
+ $height = 24;
+ $img->Set(size=>($width . "x" . $height));
+ $img->Read('xc:white');
+
+ 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 = ();
+ $img->Set(size=>"1x1");
+ $img->Read('null:');
- # 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);
- }
+ $width = 1;
+ $height = 1;
+ }
+
+ $err = $img->write(filename => $cachename, quality => 90, depth => 8);
+ $r->log->info("New infobox cache: $width x $height for $id.jpg");
- # We always want RGB JPEGs
- if ($img->Get('Colorspace') eq "CMYK") {
- $img->Set(colorspace=>'RGB');
+ return ($cachename, 'image/png');
+ }
+
+ 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);
my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
$cimg = $img;
}
+ my $width = $img->Get('columns');
+ my $height = $img->Get('rows');
my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
# Use lanczos (sharper) for heavy scaling, mitchell (faster) otherwise
}
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 == 1) {
+ if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox ne 'nobox') {
+ my $info = Image::ExifTool::ImageInfo($fname);
make_infobox($cimg, $info, $r);
}
$r->log->info("New cache: $nwidth x $nheight for $id.jpg");
}
- undef $magick;
undef $img;
if ($err) {
$r->log->warn("$fname: $err");
$err =~ /(\d+)/;
if ($1 >= 400) {
- @$magick = ();
+ #@$magick = ();
error($r, "$fname: $err");
}
}
}
- return ($cachename, 1);
+ return ($cachename, 'image/jpeg');
}
sub get_mimetype_from_filename {
$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
my @classic_fields = ();
- if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
+ if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) {
push @classic_fields, [ $1 . "mm", 0 ];
} elsif (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)\/(\d+)$/) {
push @classic_fields, [ (sprintf "%.1fmm", ($1/$2)), 0 ];
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 ];
}
# Apache2::ServerUtil->server->log_error(join(':', keys %$info));
+ my $iso = undef;
if (defined($info->{'NikonD1-ISOSetting'})) {
- push @classic_fields, [ $info->{'NikonD1-ISOSetting'}->[1] . " ISO", 0 ];
+ $iso = $info->{'NikonD1-ISOSetting'};
+ } elsif (defined($info->{'ISO'})) {
+ $iso = $info->{'ISO'};
} elsif (defined($info->{'ISOSetting'})) {
- push @classic_fields, [ $info->{'ISOSetting'} . " ISO" ];
+ $iso = $info->{'ISOSetting'};
+ }
+ if (defined($iso) && $iso =~ /(\d+)/) {
+ push @classic_fields, [ $1 . " ISO", 0 ];
}
if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
}
}
- return if (scalar @parts == 0);
+ return 0 if (scalar @parts == 0);
# Find the required width
my $th = 0;
$th = $h if ($h > $th);
}
- return if ($tw > $img->Get('columns'));
+ return 0 if ($tw > $img->Get('columns'));
my $x = 0;
my $y = $img->Get('rows') - 24;
$img->Annotate(text=>$part->[0], font=>$font, pointsize=>12, x=>int($x), y=>int($y));
$x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12))[4];
}
+
+ return 1;
}
sub gcd {
}
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;