X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=e12e8dc53efa85bba94a5a3221c37ab58025980f;hp=4014bb56661e13e5635d0abef7fe0b20486b337f;hb=fa10473159be03eb924e50cdb4688540c78f89b1;hpb=804ba7165f1ec6ee561c206e11dcbfd0dcd45a59 diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm index 4014bb5..e12e8dc 100644 --- a/perl/Sesse/pr0n/Common.pm +++ b/perl/Sesse/pr0n/Common.pm @@ -23,6 +23,7 @@ use MIME::Types; use LWP::Simple; # use Image::Info; use Image::ExifTool; +use HTML::Entities; BEGIN { use Exporter (); @@ -33,7 +34,7 @@ BEGIN { require Sesse::pr0n::Config_local; }; - $VERSION = "v2.20"; + $VERSION = "v2.41"; @ISA = qw(Exporter); @EXPORT = qw(&error &dberror); %EXPORT_TAGS = qw(); @@ -90,7 +91,7 @@ sub header { $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 { @@ -128,6 +129,9 @@ sub get_query_string { while (my ($key, $value) = each %$param) { next unless defined($value); next if (defined($defparam->{$key}) && $value == $defparam->{$key}); + + # FIXME: We'll need to escape _ here somehow + $value =~ s/ /_/g; $str .= ($first) ? "?" : ';'; $str .= "$key=$value"; @@ -183,7 +187,7 @@ sub get_cache_location { } } -sub update_width_height { +sub update_image_info { my ($r, $id, $width, $height) = @_; # Also find the date taken if appropriate (from the EXIF tag etc.) @@ -197,15 +201,32 @@ sub update_width_height { } } - $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('UPDATE images SET width=?, height=?, date=? WHERE id=?', + undef, $width, $height, $datetime, $id) + or die "Couldn't update width/height in SQL: $!"; + + $dbh->do('DELETE FROM exif_info WHERE image=?', + undef, $id) + or die "Couldn't delete old EXIF information in SQL: $!"; + + 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 { @@ -296,11 +317,23 @@ sub ensure_cached { # 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+)/; @@ -319,7 +352,7 @@ sub ensure_cached { # Update the SQL database if it doesn't contain the required info if ($dbwidth == -1 || $dbheight == -1) { $r->log->info("Updating width/height for $id: $width x $height"); - update_width_height($r, $id, $width, $height); + update_image_info($r, $id, $width, $height); } # We always want RGB JPEGs @@ -345,10 +378,12 @@ sub ensure_cached { # 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) { @@ -362,11 +397,19 @@ sub ensure_cached { # 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; @@ -426,6 +469,8 @@ sub make_infobox { 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; @@ -451,7 +496,11 @@ sub make_infobox { push @classic_fields, $info->{'ISOSetting'} . " ISO"; } - push @classic_fields, $info->{'ExposureBiasValue'} . " EV" if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0); + if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) { + push @classic_fields, $info->{'ExposureBiasValue'} . " EV"; + } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) { + push @classic_fields, $info->{'ExposureCompensation'} . " EV"; + } if (scalar @classic_fields > 0) { push @lines, join(', ', @classic_fields); @@ -549,11 +598,11 @@ sub add_new_event { 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 ();