X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=c34aa65f1df96e3a01eaeeb6c837f686792d93b9;hp=f91526001efcea11858a187b0db1bea2bcdf6922;hb=c418c8bb8654b7aa1ea16357fe259ef65022cab8;hpb=2d6536cab108c937e2af49f7dcf15f2230f44d1a diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm index f915260..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,18 +23,25 @@ use MIME::Types; use LWP::Simple; # use Image::Info; use Image::ExifTool; +use HTML::Entities; BEGIN { use Exporter (); our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - $VERSION = "v2.04"; + use Sesse::pr0n::Config; + eval { + require Sesse::pr0n::Config_local; + }; + + $VERSION = "v2.30"; @ISA = qw(Exporter); @EXPORT = qw(&error &dberror); %EXPORT_TAGS = qw(); @EXPORT_OK = qw(&error &dberror); - our $dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=127.0.0.1", "pr0n", "EsVdwImY") + our $dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host, + $Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password) or die "Couldn't connect to PostgreSQL database: " . DBI->errstr; our $mimetypes = new MIME::Types; @@ -61,6 +70,7 @@ sub error { footer($r); $r->log->error($err); + $r->log->error("Stack trace follows: " . Carp::longmess()); ModPerl::Util::exit(); } @@ -81,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 { @@ -111,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); } @@ -134,7 +152,8 @@ sub get_dbh { if (!(defined($dbh) && $dbh->ping)) { # 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=127.0.0.1", "pr0n", "EsVdwImY")) { + unless ($dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host, + $Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password)) { $dbh = undef; die "Couldn't connect to PostgreSQL database"; } @@ -165,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; - # 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) - or die "Couldn't update last_picture in SQL: $!"; + $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?', + 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 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 { @@ -262,7 +298,7 @@ sub ensure_cached { 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)) { + unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1 || $xres == -1)) { return ($fname, 0); } @@ -281,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) { @@ -302,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 @@ -334,16 +369,23 @@ sub ensure_cached { $quality = 80; } - $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter); + if ($xres != -1) { + $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter); + } - if (($nwidth >= 800 || $nheight >= 600) && $infobox == 1) { + if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox == 1) { make_infobox($cimg, $info, $r); } # 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; @@ -385,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)?$/) { @@ -397,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; @@ -422,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'}; @@ -498,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;