X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=c34aa65f1df96e3a01eaeeb6c837f686792d93b9;hb=c418c8bb8654b7aa1ea16357fe259ef65022cab8;hp=d03f46f1f01a01a10b656bb0efeb53aeb1adfb6e;hpb=d1b49fa6c2fd1b3d449dc938f0731c0426636c02;p=pr0n
diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index d03f46f..c34aa65 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -11,6 +11,8 @@ use Apache2::Const -compile => ':common';
use Apache2::Log;
use ModPerl::Util;
+use Carp;
+use Encode;
use DBI;
use DBD::Pg;
use Image::Magick;
@@ -21,6 +23,7 @@ use MIME::Types;
use LWP::Simple;
# use Image::Info;
use Image::ExifTool;
+use HTML::Entities;
BEGIN {
use Exporter ();
@@ -31,7 +34,7 @@ BEGIN {
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.05";
+ $VERSION = "v2.30";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
@@ -67,6 +70,7 @@ sub error {
footer($r);
$r->log->error($err);
+ $r->log->error("Stack trace follows: " . Carp::longmess());
ModPerl::Util::exit();
}
@@ -87,7 +91,7 @@ sub header {
$quote = LWP::Simple::get("http://itk.samfundet.no/include/quotes.cli.php");
$quote = "Error: Could not fetch quotes." if (!defined($quote));
}
- Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => $quote });
+ Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => Encode::decode_utf8($quote) });
}
sub footer {
@@ -117,21 +121,29 @@ sub scale_aspect {
return ($width, $height);
}
-sub print_link {
- my ($r, $title, $baseurl, $param, $defparam) = @_;
- my $str = "{$key}) && $value == $defparam->{$key});
- $str .= ($first) ? "?" : '&';
+ $str .= ($first) ? "?" : ';';
$str .= "$key=$value";
$first = 0;
}
-
- $str .= "\">$title";
+ return $str;
+}
+
+sub print_link {
+ my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
+ my $str = "print($str);
}
@@ -141,7 +153,7 @@ sub get_dbh {
# 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";
}
@@ -172,29 +184,46 @@ sub get_cache_location {
}
}
-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";
}
}
- $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
- undef, $width, $height, $datetime, $id)
- or die "Couldn't update width/height in SQL: $!";
+ {
+ 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: $!";
- # 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, ?) FROM images WHERE event=events.id) WHERE id=(SELECT event FROM images WHERE id=?)',
- undef, $datetime, $id)
- or die "Couldn't update last_picture 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 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: $!";
+ }
}
sub check_access {
@@ -288,7 +317,6 @@ sub ensure_cached {
# 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) {
@@ -309,7 +337,7 @@ sub ensure_cached {
# 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
@@ -352,7 +380,12 @@ sub ensure_cached {
# 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;
@@ -394,7 +427,12 @@ sub make_infobox {
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)?$/) {
@@ -406,6 +444,8 @@ sub make_infobox {
my ($a, $b) = ($1, $2);
my $gcd = gcd($a, $b);
push @classic_fields, ($a/$gcd . "/" . $b/$gcd . "s");
+ } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)$/) {
+ push @classic_fields, ($1 . "s");
}
if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
my $f = $1/$2;
@@ -431,16 +471,24 @@ sub make_infobox {
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'};
@@ -507,6 +555,48 @@ sub gcd {
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;