# use Image::Info;
use Image::ExifTool;
use HTML::Entities;
+use URI::Escape;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.21";
+ $VERSION = "v2.41";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
$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 => $quote });
+ Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => Encode::decode_utf8($quote) });
}
sub footer {
while (my ($key, $value) = each %$param) {
next unless defined($value);
next if (defined($defparam->{$key}) && $value == $defparam->{$key});
+
+ $value = URI::Escape::uri_escape($value);
+
+ # Unescape a few for prettiness (we'll need something for a real _, though)
+ $value =~ s/%20/_/g;
+ $value =~ s/%2F/\//g;
$str .= ($first) ? "?" : ';';
$str .= "$key=$value";
}
}
- $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
- undef, $width, $height, $datetime, $id)
- or die "Couldn't update width/height in SQL: $!";
+ {
+ local $dbh->{AutoCommit} = 0;
- $dbh->do('DELETE FROM exif_info WHERE image=?',
- undef, $id)
- or die "Couldn't delete old EXIF information in SQL: $!";
+ $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
+ undef, $width, $height, $datetime, $id)
+ or die "Couldn't update width/height in SQL: $!";
- my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)')
- or die "Couldn't prepare inserting EXIF information: $!";
+ $dbh->do('DELETE FROM exif_info WHERE image=?',
+ undef, $id)
+ or die "Couldn't delete old EXIF information in SQL: $!";
- for my $key (keys %$info) {
- next if ref $info->{$key};
- $q->execute($id, $key, $info->{$key})
- or die "Couldn't insert EXIF information in database: $!";
- }
+ my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)')
+ or die "Couldn't prepare inserting EXIF information: $!";
- # 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 event=(SELECT event FROM images WHERE id=?)',
- undef, $datetime, $id)
- or die "Couldn't update last_picture in SQL: $!";
+ for my $key (keys %$info) {
+ next if ref $info->{$key};
+ $q->execute($id, $key, guess_charset($info->{$key}))
+ or die "Couldn't insert EXIF 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=?)',
+ undef, $datetime, $id)
+ or die "Couldn't update last_picture in SQL: $!";
+ }
}
sub check_access {
# Need to generate the cache; read in the image
my $magick = new Image::Magick;
my $info = Image::ExifTool::ImageInfo($fname);
-
- # NEF files aren't autodetected
- $fname = "NEF:$fname" if ($filename =~ /\.nef$/i);
+ 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$/) {
+ # 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 {
+ $err = $magick->Read($fname);
+ }
- my $err = $magick->Read($fname);
if ($err) {
$r->log->warn("$fname: $err");
$err =~ /(\d+)/;
# 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 = 80;
+ $quality = 85;
+ $sf = "1x1";
}
if ($xres != -1) {
# Strip EXIF tags etc.
$cimg->Strip();
- if (($nwidth >= 640 && $nheight >= 480) ||
- ($nwidth >= 480 && $nheight >= 640)) {
- $err = $cimg->write(filename=>$cachename, quality=>$quality, interlace=>'Plane');
- } else {
- $err = $cimg->write(filename=>$cachename, quality=>$quality);
+ {
+ my %parms = (
+ filename => $cachename,
+ quality => $quality
+ );
+ if (($nwidth >= 640 && $nheight >= 480) ||
+ ($nwidth >= 480 && $nheight >= 640)) {
+ $parms{'interlace'} = 'Plane';
+ }
+ if (defined($sf)) {
+ $parms{'sampling-factor'} = $sf;
+ }
+ $err = $cimg->write(%parms);
}
undef $cimg;
my ($a, $b) = ($1, $2);
my $gcd = gcd($a, $b);
push @classic_fields, ($a/$gcd . "/" . $b/$gcd . "s");
+ } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)$/) {
+ push @classic_fields, ($1 . "s");
}
if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
my $f = $1/$2;
return @errors;
}
- $dbh->do("INSERT INTO events (id,date,name,vhost) VALUES (?,?,?,?)",
+ $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 (event,last_picture) VALUES (?,NULL)",
- undef, $id)
+ $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);
return ();