use Apache2::Log;
use ModPerl::Util;
+use Carp;
+use Encode;
use DBI;
use DBD::Pg;
use Image::Magick;
use LWP::Simple;
# use Image::Info;
use Image::ExifTool;
+use HTML::Entities;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.04";
+ $VERSION = "v2.21";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
footer($r);
$r->log->error($err);
+ $r->log->error("Stack trace follows: " . Carp::longmess());
ModPerl::Util::exit();
}
return ($width, $height);
}
-sub print_link {
- my ($r, $title, $baseurl, $param, $defparam) = @_;
- my $str = "<a href=\"$baseurl";
+sub get_query_string {
+ my ($param, $defparam) = @_;
my $first = 1;
+ my $str = "";
while (my ($key, $value) = each %$param) {
next unless defined($value);
next if (defined($defparam->{$key}) && $value == $defparam->{$key});
- $str .= ($first) ? "?" : '&';
+ $str .= ($first) ? "?" : ';';
$str .= "$key=$value";
$first = 0;
}
-
- $str .= "\">$title</a>";
+ return $str;
+}
+
+sub print_link {
+ my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
+ my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";
+ if (defined($accesskey) && length($accesskey) == 1) {
+ $str .= " accesskey=\"$accesskey\"";
+ }
+ $str .= ">$title</a>";
$r->print($str);
}
# Try to reconnect
Apache2::ServerUtil->server->log_error("Lost contact with PostgreSQL server, trying to reconnect...");
unless ($dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host,
- $Sesse::pr0n::Config::db_user, $Sesse::pr0n::Config::db_password)) {
+ $Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password)) {
$dbh = undef;
die "Couldn't connect to PostgreSQL database";
}
}
}
-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.)
my $info = Image::ExifTool::ImageInfo(get_disk_location($r, $id));
my $datetime = undef;
-
+
if (defined($info->{'DateTimeOriginal'})) {
# Parse the date and time over to ISO format
- if ($info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/ && $1 > 1990) {
+ if ($info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)(?:\+\d\d:\d\d)?$/ && $1 > 1990) {
$datetime = "$1-$2-$3 $4:$5:$6";
}
}
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: $!";
+
+ 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 events SET last_picture=(SELECT COALESCE(MAX(date),\'1970-01-01 00:00:00\') FROM images WHERE event=events.id) WHERE id=(SELECT event FROM images WHERE id=?)',
- undef, $id)
+ $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: $!";
}
# NEF files aren't autodetected
$fname = "NEF:$fname" if ($filename =~ /\.nef$/i);
- $r->log->warn("Generating $fname for $filename");
my $err = $magick->Read($fname);
if ($err) {
# 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
# Strip EXIF tags etc.
$cimg->Strip();
- $err = $cimg->write(filename=>$cachename, quality=>$quality);
+ 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);
+ }
undef $cimg;
push @lines, "$1-$2-$3 $4:$5";
}
- push @lines, $info->{'Model'} if (defined($info->{'Model'}));
+ if (defined($info->{'Model'})) {
+ my $model = $info->{'Model'};
+ $model =~ s/^\s+//;
+ $model =~ s/\s+$//;
+ push @lines, $model;
+ }
# classic fields
if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
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);
}
if (defined($info->{'Flash'})) {
- if ($info->{'Flash'} =~ /did not fire/ || $info->{'Flash'} =~ /No Flash/) {
+ if ($info->{'Flash'} =~ /did not fire/i ||
+ $info->{'Flash'} =~ /no flash/i ||
+ $info->{'Flash'} =~ /not fired/i ||
+ $info->{'Flash'} =~ /Off/) {
push @lines, "No flash";
- } elsif ($info->{'Flash'} =~ /fired/) {
+ } elsif ($info->{'Flash'} =~ /fired/i ||
+ $info->{'Flash'} =~ /On/) {
push @lines, "Flash";
} else {
push @lines, $info->{'Flash'};
return gcd($b, $a % $b);
}
+sub add_new_event {
+ my ($dbh, $id, $date, $desc, $vhost) = @_;
+ my @errors = ();
+
+ if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) {
+ push @errors, "Manglende eller ugyldig ID.";
+ }
+ if (!defined($date) || $date =~ /^\s*$/ || $date =~ /[<>&]/ || length($date) > 100) {
+ push @errors, "Manglende eller ugyldig dato.";
+ }
+ if (!defined($desc) || $desc =~ /^\s*$/ || $desc =~ /[<>&]/ || length($desc) > 100) {
+ push @errors, "Manglende eller ugyldig beskrivelse.";
+ }
+
+ if (scalar @errors > 0) {
+ return @errors;
+ }
+
+ $dbh->do("INSERT INTO events (id,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)
+ or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr);
+
+ return ();
+}
+
+sub guess_charset {
+ my $text = shift;
+ my $decoded;
+
+ eval {
+ $decoded = Encode::decode("utf-8", $text, Encode::FB_CROAK);
+ };
+ if ($@) {
+ $decoded = Encode::decode("iso8859-1", $text);
+ }
+
+ return $decoded;
+}
+
1;