require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.41";
+ $VERSION = "v2.53";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
}
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);
-
- # Unescape a few for prettiness (we'll need something for a real _, though)
- $value =~ s/%20/_/g;
$value =~ s/%2F/\//g;
return $value;
my $value = shift;
# URI unescaping is already done for us
- $value =~ s/_/ /g;
+ $value =~ s/(_+)/weird_space_unencode($1)/ge;
return $value;
}
{
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 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: $!";
- my $q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)')
+ $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: $!";
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) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
return ($fname, 0);
}
# 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$/) {
+ if ($filename =~ /\.nef$/i) {
# this would suffice if ImageMagick gets to fix their handling
# $fname = "NEF:$fname";
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);
}
sub make_infobox {
my ($img, $info, $r) = @_;
-
- my @lines = ();
- my @classic_fields = ();
-
- if (defined($info->{'DateTimeOriginal'}) &&
- $info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
- && $1 >= 1990) {
- push @lines, "$1-$2-$3 $4:$5";
- }
- if (defined($info->{'Model'})) {
- my $model = $info->{'Model'};
- $model =~ s/^\s+//;
- $model =~ s/\s+$//;
- push @lines, $model;
- }
+ # The infobox is of the form
+ # "Time - date - focal length, shutter time, aperture, sensitivity, exposure bias - flash",
+ # possibly with some parts omitted -- the middle part is known as the "classic
+ # fields"; note the comma separation. Every field has an associated "bold flag"
+ # in the second part.
- # classic fields
+ my $shutter_priority = (defined($info->{'ExposureProgram'}) &&
+ $info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
+ my $aperture_priority = (defined($info->{'ExposureProgram'}) &&
+ $info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
+
+ my @classic_fields = ();
if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
- push @classic_fields, ($1 . "mm");
+ push @classic_fields, [ $1 . "mm", 0 ];
} elsif (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)\/(\d+)$/) {
- push @classic_fields, (sprintf "%.1fmm", ($1/$2));
+ push @classic_fields, [ (sprintf "%.1fmm", ($1/$2)), 0 ];
}
+
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");
+ push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $shutter_priority ];
} elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)$/) {
- push @classic_fields, ($1 . "s");
+ push @classic_fields, [ $1 . "s", $shutter_priority ];
}
+
if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
my $f = $1/$2;
if ($f >= 10) {
- push @classic_fields, (sprintf "f/%.0f", $f);
+ push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
} else {
- push @classic_fields, (sprintf "f/%.1f", $f);
+ push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
}
} elsif (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\.(\d+)$/) {
my $f = $info->{'FNumber'};
if ($f >= 10) {
- push @classic_fields, (sprintf "f/%.0f", $f);
+ push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
} else {
- push @classic_fields, (sprintf "f/%.1f", $f);
+ push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_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";
+ $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'} != 0) {
- push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
+ if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
+ push @classic_fields, [ $info->{'ExposureBiasValue'} . " EV", 0 ];
} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
- push @classic_fields, $info->{'ExposureCompensation'} . " EV";
+ push @classic_fields, [ $info->{'ExposureCompensation'} . " EV", 0 ];
+ }
+
+ # Now piece together the rest
+ my @parts = ();
+
+ if (defined($info->{'DateTimeOriginal'}) &&
+ $info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
+ && $1 >= 1990) {
+ push @parts, [ "$1-$2-$3 $4:$5", 0 ];
+ }
+
+ if (defined($info->{'Model'})) {
+ my $model = $info->{'Model'};
+ $model =~ s/^\s+//;
+ $model =~ s/\s+$//;
+
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ $model, 0 ];
}
+ # classic fields
if (scalar @classic_fields > 0) {
- push @lines, join(', ', @classic_fields);
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+
+ my $first_elem = 1;
+ for my $field (@classic_fields) {
+ push @parts, [ ', ', 0 ] if (!$first_elem);
+ $first_elem = 0;
+ push @parts, $field;
+ }
}
if (defined($info->{'Flash'})) {
$info->{'Flash'} =~ /no flash/i ||
$info->{'Flash'} =~ /not fired/i ||
$info->{'Flash'} =~ /Off/) {
- push @lines, "No flash";
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "No flash", 0 ];
} elsif ($info->{'Flash'} =~ /fired/i ||
$info->{'Flash'} =~ /On/) {
- push @lines, "Flash";
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "Flash", 0 ];
} else {
- push @lines, $info->{'Flash'};
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ $info->{'Flash'}, 0 ];
}
}
- return if (scalar @lines == 0);
-
- # OK, this sucks. Let's make something better :-)
- @lines = ( join(" - ", @lines) );
+ return if (scalar @parts == 0);
# Find the required width
- my $th = 14 * (scalar @lines) + 6;
- my $tw = 1;
+ my $th = 0;
+ my $tw = 0;
- for my $line (@lines) {
- my $this_w = ($img->QueryFontMetrics(text=>$line, font=>'/usr/share/fonts/truetype/msttcorefonts/Arial.ttf', pointsize=>12))[4];
- $tw = $this_w if ($this_w >= $tw);
- }
+ for my $part (@parts) {
+ my $font;
+ if ($part->[1]) {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf';
+ } else {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf';
+ }
- $tw += 6;
+ my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12));
+
+ $tw += $w;
+ $th = $h if ($h > $th);
+ }
- # Round up so we hit exact DCT blocks
- $tw += 8 - ($tw % 8) unless ($tw % 8 == 0);
- $th += 8 - ($th % 8) unless ($th % 8 == 0);
-
return if ($tw > $img->Get('columns'));
-# my $x = $img->Get('columns') - 8 - $tw;
-# my $y = $img->Get('rows') - 8 - $th;
my $x = 0;
- my $y = $img->Get('rows') - $th;
- $tw = $img->Get('columns');
+ my $y = $img->Get('rows') - 24;
- $x -= $x % 8;
- $y -= $y % 8;
+ # Hit exact DCT blocks
+ $y -= ($y % 8);
- my $points = sprintf "%u,%u %u,%u", $x, $y, ($x+$tw-1), ($img->Get('rows') - 1);
- my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($x+$tw-1), $y;
-# $img->Draw(primitive=>'rectangle', stroke=>'black', fill=>'white', points=>$points);
+ 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);
- my $i = -(scalar @lines - 1)/2.0;
- my $xc = $x + $tw / 2 - $img->Get('columns')/2;
- my $yc = ($y + $img->Get('rows'))/2 - $img->Get('rows')/2;
- #my $yc = ($y + $img->Get('rows'))/4;
- my $yi = $th / (scalar @lines);
-
- $lpoints = sprintf "%u,%u %u,%u", $x, $yc + $img->Get('rows')/2, ($x+$tw-1), $yc+$img->Get('rows')/2;
+ # Start writing out the text
+ $x = ($img->Get('columns') - $tw) / 2;
- for my $line (@lines) {
- $img->Annotate(text=>$line, font=>'/usr/share/fonts/truetype/msttcorefonts/Arial.ttf', pointsize=>12, gravity=>'Center',
- # $img->Annotate(text=>$line, font=>'Helvetica', pointsize=>12, gravity=>'Center',
- x=>int($xc), y=>int($yc + $i * $yi));
+ my $room = ($img->Get('rows') - 1 - $y - $th);
+ $y = ($img->Get('rows') - 1) - $room/2;
- $i = $i + 1;
+ for my $part (@parts) {
+ my $font;
+ if ($part->[1]) {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf';
+ } 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];
}
}