require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.41";
+ $VERSION = "v2.50";
@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) && ($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);
}
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";