Support >1 sec exposure times in EXIF.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 2079d6aad69c182bb26c392dec7feaf32f2ed916..c34aa65f1df96e3a01eaeeb6c837f686792d93b9 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -23,6 +23,7 @@ use MIME::Types;
 use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
+use HTML::Entities;
 
 BEGIN {
        use Exporter ();
@@ -33,7 +34,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.12";
+       $VERSION     = "v2.30";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -90,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 {
@@ -183,7 +184,7 @@ 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.)
@@ -197,15 +198,32 @@ sub update_width_height {
                }
        }
 
-       $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 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: $!";
+               $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 {
@@ -319,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
@@ -362,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;
 
@@ -421,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;
@@ -446,7 +471,11 @@ 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);
@@ -526,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;