Error: $err
\n"); - footer($r); + header($r, $io, $title); + $io->print("Error: $err
\n"); + footer($r, $io); - $r->log->error($err); - $r->log->error("Stack trace follows: " . Carp::longmess()); + log_error($r, $err); + log_error($r, "Stack trace follows: " . Carp::longmess()); - ModPerl::Util::exit(); + $io->setpos(0); + $res->body($io); + return $res; } sub dberror { my ($r,$err) = @_; - error($r, "$err (DB error: " . $dbh->errstr . ")"); + return error($r, "$err (DB error: " . $dbh->errstr . ")"); } sub header { - my ($r,$title) = @_; + my ($r, $io, $title) = @_; $r->content_type("text/html; charset=utf-8"); # Fetch quote if we're itk-bilder.samfundet.no my $quote = ""; - if ($r->get_server_name eq 'itk-bilder.samfundet.no') { + if (Sesse::pr0n::Common::get_server_name($r) eq 'itk-bilder.samfundet.no') { $quote = LWP::Simple::get("http://itk.samfundet.no/include/quotes.cli.php"); $quote = "Error: Could not fetch quotes." if (!defined($quote)); } - Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => Encode::decode_utf8($quote) }); + Sesse::pr0n::Templates::print_template($r, $io, "header", { title => $title, quotes => $quote }); } sub footer { - my ($r) = @_; - Sesse::pr0n::Templates::print_template($r, "footer", + my ($r, $io) = @_; + Sesse::pr0n::Templates::print_template($r, $io, "footer", { version => $Sesse::pr0n::Common::VERSION }); } @@ -127,7 +128,8 @@ sub get_query_string { my $first = 1; my $str = ""; - while (my ($key, $value) = each %$param) { + for my $key (sort keys %$param) { + my $value = $param->{$key}; next unless defined($value); next if (defined($defparam->{$key}) && $value == $defparam->{$key}); @@ -179,20 +181,20 @@ sub pretty_unescape { } sub print_link { - my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_; + my ($io, $title, $baseurl, $param, $defparam, $accesskey) = @_; my $str = "print($str); + $io->print($str); } sub get_dbh { # Check that we are alive if (!(defined($dbh) && $dbh->ping)) { # Try to reconnect - Apache2::ServerUtil->server->log_error("Lost contact with PostgreSQL server, trying to reconnect..."); + print STDERR "Lost contact with PostgreSQL server, trying to reconnect...\n"; unless ($dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host, $Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password)) { $dbh = undef; @@ -203,28 +205,54 @@ sub get_dbh { return $dbh; } -sub get_base { - my $r = shift; - return $r->dir_config('ImageBase'); -} - sub get_disk_location { my ($r, $id) = @_; my $dir = POSIX::floor($id / 256); - return get_base($r) . "images/$dir/$id.jpg"; + return $Sesse::pr0n::Config::image_base . "images/$dir/$id.jpg"; } sub get_cache_location { - my ($r, $id, $width, $height, $infobox) = @_; + my ($id, $width, $height) = @_; + my $dir = POSIX::floor($id / 256); + + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.jpg"; +} + +sub get_infobox_cache_location { + my ($id, $width, $height, $dpr) = @_; my $dir = POSIX::floor($id / 256); - if ($infobox) { - return get_base($r) . "cache/$dir/$id-$width-$height.jpg"; + if ($dpr == 1) { + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box.png"; } else { - return get_base($r) . "cache/$dir/$id-$width-$height-nobox.jpg"; + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box\@$dpr.png"; } } +sub ensure_disk_location_exists { + my ($r, $id) = @_; + my $dir = POSIX::floor($id / 256); + + my $img_dir = $Sesse::pr0n::Config::image_base . "/images/$dir/"; + if (! -d $img_dir) { + log_info($r, "Need to create new image directory $img_dir"); + mkdir($img_dir) or die "Couldn't create new image directory $img_dir"; + } + + my $cache_dir = $Sesse::pr0n::Config::image_base . "/cache/$dir/"; + if (! -d $cache_dir) { + log_info($r, "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); + + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-mipmap-$width-$height.jpg"; +} + sub update_image_info { my ($r, $id, $width, $height) = @_; @@ -276,24 +304,9 @@ sub update_image_info { undef, $width, $height, $datetime, $model, $lens, $id) or die "Couldn't update width/height in SQL: $!"; - # Tags - my @tags = $exiftool->GetValue('Keywords', 'ValueConv'); - $dbh->do('DELETE FROM tags WHERE image=?', - undef, $id) - or die "Couldn't delete old tag information in SQL: $!"; - - $q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)') - or die "Couldn't prepare inserting tag information: $!"; - - - for my $tag (@tags) { - $q->execute($id, guess_charset($tag)) - or die "Couldn't insert tag information in database: $!"; - } - # 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: $!"; } @@ -301,19 +314,70 @@ sub update_image_info { sub check_access { my $r = shift; + + #return qw(sesse Sesse); + + my $auth = $r->header('authorization'); + if (!defined($auth)) { + return undef; + } + if ($auth =~ /^Basic ([a-zA-Z0-9+\/]+=*)$/) { + return check_basic_auth($r, $1); + } + return undef; +} - my $auth = $r->headers_in->{'authorization'}; - if (!defined($auth) || $auth !~ m#^Basic ([a-zA-Z0-9+/]+=*)$#) { +sub generate_401 { + my ($r) = @_; + my $res = Plack::Response->new(401); + $res->content_type('text/plain; charset=utf-8'); + $res->status(401); + $res->header('WWW-Authenticate' => 'Basic realm="pr0n.sesse.net"'); + + $res->body("Need authorization\n"); + return $res; +} + +sub check_basic_auth { + my ($r, $auth) = @_; + + my ($raw_user, $pass) = split /:/, MIME::Base64::decode_base64($auth); + my ($user, $takenby) = extract_takenby($raw_user); + + my $ref = $dbh->selectrow_hashref('SELECT cryptpassword FROM users WHERE username=? AND vhost=?', + undef, $user, Sesse::pr0n::Common::get_server_name($r)); + my $bcrypt_matches = 0; + if (!defined($ref) || Crypt::Eksblowfish::Bcrypt::bcrypt($pass, $ref->{'cryptpassword'}) ne $ref->{'cryptpassword'}) { $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"); + log_warn($r, "Authentication failed for $user/$takenby"); return undef; } - - #return qw(sesse Sesse); + log_info($r, "Authentication succeeded for $user/$takenby"); + + return ($user, $takenby); +} + +sub get_pseudorandom_bytes { + my $num_left = shift; + my $bytes = ""; + open my $randfh, "<", "/dev/urandom" + or die "/dev/urandom: $!"; + binmode $randfh; + while ($num_left > 0) { + my $tmp; + if (sysread($randfh, $tmp, $num_left) == -1) { + die "sysread(/dev/urandom): $!"; + } + $bytes .= $tmp; + $num_left -= length($bytes); + } + close $randfh; + return $bytes; +} + +sub extract_takenby { + my ($user) = shift; - my ($user, $pass) = split /:/, MIME::Base64::decode_base64($1); # WinXP is stupid :-) if ($user =~ /^.*\\(.*)$/) { $user = $1; @@ -326,22 +390,6 @@ sub check_access { } else { ($takenby = $user) =~ s/^([a-zA-Z])/uc($1)/e; } - - my $oldpass = $pass; - $pass = Digest::SHA1::sha1_base64($pass); - my $ref = $dbh->selectrow_hashref('SELECT count(*) AS auth FROM users WHERE username=? AND sha1password=? AND vhost=?', - 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"); - return undef; - } - - $r->log->info("Authentication succeeded for $user/$takenby"); return ($user, $takenby); } @@ -367,76 +415,188 @@ sub stat_image_from_id { return ($fname, $size, $mtime); } -sub ensure_cached { - my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_; +# Takes in an image ID and a set of resolutions, and returns (generates if needed) +# 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, @res) = @_; + my ($img, $mmimg, $width, $height); + + my $physical_fname = get_disk_location($r, $id); - my $fname = get_disk_location($r, $id); - unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) { - return ($fname, 0); + # 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); + $width = $img->Get('columns'); + $height = $img->Get('rows'); + } else { + $width = $dbwidth; + $height = $dbheight; } - my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox); - if (! -r $cachename or (-M $cachename > -M $fname)) { - # If we are in overload mode (aka Slashdot mode), refuse to generate - # new thumbnails. - if (Sesse::pr0n::Overload::is_in_overload($r)) { - $r->log->warn("In overload mode, not scaling $id to $xres x $yres"); - error($r, 'System is in overload mode, not doing any scaling'); - } + # Generate the list of mipmaps + my @mmlist = (); - # 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"; - - open DCRAW, "-|", "dcraw", "-w", "-c", $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'); + 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; } - $err = $magick->Read($fname); } + + last if (!$large_enough); + + $mmwidth = $new_mmwidth; + $mmheight = $new_mmheight; + + push @mmlist, [ $mmwidth, $mmheight ]; + } - if ($err) { - $r->log->warn("$fname: $err"); - $err =~ /(\d+)/; - if ($1 >= 400) { - undef $magick; - error($r, "$fname: $err"); + # 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)) { + $img = Sesse::pr0n::QscaleProxy->new; + $img->Read($last_good_mmlocation); + } else { + $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight); + } } + my $cimg; + if ($last) { + $cimg = $img; + } else { + $cimg = $img->Clone(); + } + log_info($r, "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 + $img = Sesse::pr0n::QscaleProxy->new; + my $err = $img->Read($mmlocation); + } + } - # If we use ->[0] unconditionally, text rendering (!) seems to crash - my $img = (scalar @$magick > 1) ? $magick->[0] : $magick; + if (!defined($img)) { + $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight); + $width = $img->Get('columns'); + $height = $img->Get('rows'); + } + return ($img, $width, $height); +} - my $width = $img->Get('columns'); - my $height = $img->Get('rows'); +sub read_original_image { + my ($r, $filename, $id, $dbwidth, $dbheight) = @_; - # 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); + my $physical_fname = get_disk_location($r, $id); + + # Read in the original image + my $magick; + if ($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) { + log_warn($r, "$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) !~ /Image::Magick/) { + $img = $magick; + } else { + $img = (scalar @$magick > 1) ? $magick->[0] : $magick; + } + + return $img; +} + +sub ensure_cached { + my ($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_; + + my ($new_dbwidth, $new_dbheight); + + my $fname = get_disk_location($r, $id); + unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) { + return ($fname, undef); + } + + my $cachename = get_cache_location($id, $xres, $yres); + my $err; + if (! -r $cachename or (-M $cachename > -M $fname)) { + # If we are in overload mode (aka Slashdot mode), refuse to generate + # new thumbnails. + if (Sesse::pr0n::Overload::is_in_overload($r)) { + log_warn($r, "In overload mode, not scaling $id to $xres x $yres"); + error($r, 'System is in overload mode, not doing any scaling'); + } + + my $img; + ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $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); + my $cachename = get_cache_location($id, $xres, $yres); my $cimg; if (defined($nxres) && defined($nyres)) { @@ -447,25 +607,16 @@ sub ensure_cached { $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 - 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); - } - - if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox == 1) { - make_infobox($cimg, $info, $r); + $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf); } # Strip EXIF tags etc. @@ -490,21 +641,90 @@ sub ensure_cached { ($xres, $yres) = ($nxres, $nyres); - $r->log->info("New cache: $nwidth x $nheight for $id.jpg"); + log_info($r, "New cache: $nwidth x $nheight for $id.jpg"); } - undef $magick; undef $img; if ($err) { - $r->log->warn("$fname: $err"); + log_warn($r, "$fname: $err"); $err =~ /(\d+)/; if ($1 >= 400) { - @$magick = (); + #@$magick = (); error($r, "$fname: $err"); } } } - return ($cachename, 1); + + # Update the SQL database if it doesn't contain the required info + if (!defined($dbwidth) && defined($new_dbwidth)) { + log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight"); + update_image_info($r, $id, $new_dbwidth, $new_dbheight); + } + + return ($cachename, 'image/jpeg'); +} + +sub ensure_infobox_cached { + my ($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres) = @_; + + my ($new_dbwidth, $new_dbheight); + + my $fname = get_disk_location($r, $id); + my $cachename = get_infobox_cache_location($id, $xres, $yres, $dpr); + my $err; + if (! -r $cachename or (-M $cachename > -M $fname)) { + # If we are in overload mode (aka Slashdot mode), refuse to generate + # new thumbnails. + if (Sesse::pr0n::Overload::is_in_overload($r)) { + log_warn($r, "In overload mode, not scaling $id to $xres x $yres"); + error($r, 'System is in overload mode, not doing any scaling'); + } + + # We need the exact width so we can make one in the right size. + my ($width, $height); + + # This is slow, but should fortunately almost never happen, so don't bother + # special-casing it. + if (!defined($dbwidth) || !defined($dbheight)) { + my $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, 0); + $new_dbwidth = $width = $img->Get('columns'); + $new_dbheight = $height = $img->Get('rows'); + } else { + $width = $dbwidth; + $height = $dbheight; + } + my $img = Image::Magick->new; + + if (defined($xres) && defined($yres)) { + ($width, $height) = scale_aspect($width, $height, $xres, $yres); + } + $height = 24 * $dpr; + $img->Set(size=>($width . "x" . $height)); + $img->Read('xc:white'); + + my $info = Image::ExifTool::ImageInfo($fname); + if (make_infobox($img, $info, $r, $dpr)) { + $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:'); + + $width = 1; + $height = 1; + } + + $err = $img->write(filename => $cachename, quality => 90, depth => 8); + log_info($r, "New infobox cache: $width x $height for $id.jpg"); + } + + return ($cachename, 'image/png'); } sub get_mimetype_from_filename { @@ -515,7 +735,7 @@ sub get_mimetype_from_filename { } sub make_infobox { - my ($img, $info, $r) = @_; + my ($img, $info, $r, $dpr) = @_; # The infobox is of the form # "Time - date - focal length, shutter time, aperture, sensitivity, exposure bias - flash", @@ -523,13 +743,17 @@ 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 (defined($info->{'ExposureProgram'}) && $info->{'ExposureProgram'} =~ /manual/i) { + $manual_shutter = 1; + $manual_aperture = 1; + } 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 ]; @@ -538,24 +762,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+)$/) { - 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 ]; } } @@ -575,7 +799,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 ]; } @@ -593,13 +817,13 @@ sub make_infobox { $model =~ s/^\s+//; $model =~ s/\s+$//; - push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0); push @parts, [ $model, 0 ]; } # classic fields if (scalar @classic_fields > 0) { - push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0); my $first_elem = 1; for my $field (@classic_fields) { @@ -614,19 +838,19 @@ sub make_infobox { $info->{'Flash'} =~ /no flash/i || $info->{'Flash'} =~ /not fired/i || $info->{'Flash'} =~ /Off/) { - push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0); push @parts, [ "No flash", 0 ]; } elsif ($info->{'Flash'} =~ /fired/i || $info->{'Flash'} =~ /On/) { - push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0); push @parts, [ "Flash", 0 ]; } else { - push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0); push @parts, [ $info->{'Flash'}, 0 ]; } } - return if (scalar @parts == 0); + return 0 if (scalar @parts == 0); # Find the required width my $th = 0; @@ -640,16 +864,16 @@ sub make_infobox { $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf'; } - my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12)); + my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12*$dpr)); $tw += $w; $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; + my $y = $img->Get('rows') - 24*$dpr; # Hit exact DCT blocks $y -= ($y % 8); @@ -657,13 +881,13 @@ sub make_infobox { my $points = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), ($img->Get('rows') - 1); my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), $y; $img->Draw(primitive=>'rectangle', stroke=>'white', fill=>'white', points=>$points); - $img->Draw(primitive=>'line', stroke=>'black', points=>$lpoints); + $img->Draw(primitive=>'line', stroke=>'black', strokewidth=>$dpr, points=>$lpoints); # Start writing out the text $x = ($img->Get('columns') - $tw) / 2; - my $room = ($img->Get('rows') - 1 - $y - $th); - $y = ($img->Get('rows') - 1) - $room/2; + my $room = ($img->Get('rows') - $dpr - $y - $th); + $y = ($img->Get('rows') - $dpr) - $room/2; for my $part (@parts) { my $font; @@ -672,9 +896,11 @@ sub make_infobox { } else { $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf'; } - $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]; + $img->Annotate(text=>$part->[0], font=>$font, pointsize=>12*$dpr, x=>int($x), y=>int($y)); + $x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12*$dpr))[4]; } + + return 1; } sub gcd { @@ -684,7 +910,7 @@ sub gcd { } sub add_new_event { - my ($dbh, $id, $date, $desc, $vhost) = @_; + my ($r, $res, $dbh, $id, $date, $desc) = @_; my @errors = (); if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) { @@ -701,12 +927,14 @@ sub add_new_event { return @errors; } + my $vhost = Sesse::pr0n::Common::get_server_name($r); $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, $res, "/"); return (); } @@ -725,6 +953,110 @@ sub guess_charset { 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, $res, @elements) = @_; + return if (scalar @elements == 0); + + my @pe = (); + for my $elem (@elements) { + log_info($r, "Purging $elem"); + (my $e = $elem) =~ s/[.+*|()]/\\$&/g; + push @pe, $e; + } + + my $regex = "^"; + if (scalar @pe == 1) { + $regex .= $pe[0]; + } else { + $regex .= "(" . join('|', @pe) . ")"; + } + $regex .= "(\\?.*)?\$"; + $res->header('X-Pr0n-Purge' => $regex); +} + +# 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 = $Sesse::pr0n::Config::image_base . "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--1--1-box\.png$/) { + push @ret, "/$event/box/$filename"; + } elsif ($fname =~ /^$id-(\d+)-(\d+)-box\.png$/) { + push @ret, "/$event/$1x$2/box/$filename"; + } else { + log_warn($r, "Couldn't find a purging URL for $fname"); + } + } + + return @ret; +} + +sub set_last_modified { + my ($res, $mtime) = @_; + + my $str = POSIX::strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime($mtime)); + $res->header('Last-Modified' => $str); +} + +sub get_server_name { + my $r = shift; + my $host = $r->env->{'HTTP_HOST'}; + $host =~ s/:.*//; + return $host; +} + +sub log_info { + my ($r, $msg) = @_; + if (defined($r->logger)) { + $r->logger->({ level => 'info', message => $msg }); + } else { + print STDERR "[INFO] $msg\n"; + } +} + +sub log_warn { + my ($r, $msg) = @_; + if (defined($r->logger)) { + $r->logger->({ level => 'warn', message => $msg }); + } else { + print STDERR "[WARN] $msg\n"; + } +} + +sub log_error { + my ($r, $msg) = @_; + if (defined($r->logger)) { + $r->logger->({ level => 'error', message => $msg }); + } else { + print STDERR "[ERROR] $msg\n"; + } +} + 1;