# use Image::Info;
use Image::ExifTool;
use HTML::Entities;
+use URI::Escape;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.40";
+ $VERSION = "v2.51";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
while (my ($key, $value) = each %$param) {
next unless defined($value);
next if (defined($defparam->{$key}) && $value == $defparam->{$key});
+
+ $value = pretty_escape($value);
$str .= ($first) ? "?" : ';';
$str .= "$key=$value";
return $str;
}
+# This is not perfect (it can't handle "_ " right, for one), but it will do for now
+sub weird_space_encode {
+ my $val = shift;
+ if ($val =~ /_/) {
+ return "_" x (length($val) * 2);
+ } else {
+ return "_" x (length($val) * 2 - 1);
+ }
+}
+
+sub weird_space_unencode {
+ my $val = shift;
+ if (length($val) % 2 == 0) {
+ return "_" x (length($val) / 2);
+ } else {
+ return " " x ((length($val) + 1) / 2);
+ }
+}
+
+sub pretty_escape {
+ my $value = shift;
+
+ $value =~ s/(([_ ])\2*)/weird_space_encode($1)/ge;
+ $value = URI::Escape::uri_escape($value);
+ $value =~ s/%2F/\//g;
+
+ return $value;
+}
+
+sub pretty_unescape {
+ my $value = shift;
+
+ # URI unescaping is already done for us
+ $value =~ s/(_+)/weird_space_unencode($1)/ge;
+
+ return $value;
+}
+
sub print_link {
my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";
my ($r, $id, $width, $height) = @_;
# Also find the date taken if appropriate (from the EXIF tag etc.)
- my $info = Image::ExifTool::ImageInfo(get_disk_location($r, $id));
+ my $exiftool = Image::ExifTool->new;
+ $exiftool->ExtractInfo(get_disk_location($r, $id));
+ my $info = $exiftool->GetInfo();
my $datetime = undef;
if (defined($info->{'DateTimeOriginal'})) {
{
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: $!";
-
+ # EXIF information
$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 (?,?,?)')
+ my $q = $dbh->prepare('INSERT INTO exif_info (image,key,value) VALUES (?,?,?)')
or die "Couldn't prepare inserting EXIF information: $!";
for my $key (keys %$info) {
or die "Couldn't insert EXIF information in database: $!";
}
+ # Model/Lens
+ my $model = $exiftool->GetValue('Model', 'PrintConv');
+ my $lens = $exiftool->GetValue('Lens', 'PrintConv');
+ $lens = $exiftool->GetValue('LensSpec', 'PrintConv') if (!defined($lens));
+
+ $model =~ s/^\s*//;
+ $model =~ s/\s*$//;
+ $model = undef if (length($model) == 0);
+
+ $lens =~ s/^\s*//;
+ $lens =~ s/\s*$//;
+ $lens = undef if (length($lens) == 0);
+
+ # Now update the main table with the information we've got
+ $dbh->do('UPDATE images SET width=?, height=?, date=?, model=?, lens=? WHERE id=?',
+ 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=?)',
my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
- unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1 || $xres == -1)) {
+ unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $xres == -1)) {
return ($fname, 0);
}
my $height = $img->Get('rows');
# Update the SQL database if it doesn't contain the required info
- if ($dbwidth == -1 || $dbheight == -1) {
+ if (!defined($dbwidth) || !defined($dbheight)) {
$r->log->info("Updating width/height for $id: $width x $height");
update_image_info($r, $id, $width, $height);
}
# 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;
push @classic_fields, $info->{'ISOSetting'} . " ISO";
}
- if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) {
+ if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
push @classic_fields, $info->{'ExposureCompensation'} . " EV";