# use Image::Info;
use Image::ExifTool;
use HTML::Entities;
+use URI::Escape;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.41";
+ $VERSION = "v2.49";
@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'})) {
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: $!";
}
+ # 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=?)',
$parms{'interlace'} = 'Plane';
}
if (defined($sf)) {
- $parms{'scaling-factor'} = $sf;
+ $parms{'sampling-factor'} = $sf;
}
$err = $cimg->write(%parms);
}
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";